Release 0.0.2 (#12)

* Release 0.0.2 updates * update read me * add javadoc to maven upload
prebid · Aug 16, 2017 · 6c06772 · 6c06772
1 parent b5902d3
commit 6c06772
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 25 deletions.
diff --git a/Maven/deployprebidmobile.sh b/Maven/deployprebidmobile.sh
@@ -3,29 +3,17 @@
 #################################
 # Update Maven Release folder
 #################################
+
 rm PrebidMobile.jar >/dev/null 2>/dev/null
 rm PrebidMobile-sources.jar >/dev/null 2>/dev/null
-rm PrebidMobile-sources.jar >/dev/null 2>/dev/null
+rm PrebidMobile-javadoc.jar >/dev/null 2>/dev/null
 cp ../out/PrebidMobile.jar .
 cp ../out/PrebidMobile.jar PrebidMobile-sources.jar
+cp -r ../out/Javadoc Javadoc
+jar cf PrebidMobile-javadoc.jar Javadoc
 
 function echoX {
-echo -e "APPNEXUS DEPLOY-LOG: $@"
-}
-
-spinner()
-{
-local pid=$1
-local delay=0.75
-local spinstr='|/-\'
-while [ "$(ps a | awk '{print $1}' | grep $pid)" ]; do
-local temp=${spinstr#?}
-printf " [%c]  " "$spinstr"
-local spinstr=$temp${spinstr%"$temp"}
-sleep $delay
-printf "\b\b\b\b\b\b"
-done
-printf "    \b\b\b\b"
+echo -e "PREBID DEPLOY-LOG: $@"
 }
 
 #######
@@ -37,7 +25,7 @@ echoX "Deploying Prebid Mobile SDK on Maven..."
 #######
 # Deploy
 #######
-(mvn gpg:sign-and-deploy-file "-DpomFile=pom.xml" "-Dfile=PrebidMobile.jar" "-DrepositoryId=ossrh" "-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/" "-DstagingRepositoryId=ossrh" "-Dsources=PrebidMobile-sources.jar" "-Djavadoc=PrebidMobile-javadoc.jar" || { echoX "Deploy failed!"; echoX "End Script"; exit 1; } ) & spinner $!
+mvn gpg:sign-and-deploy-file "-DpomFile=pom.xml" "-Dfile=PrebidMobile.jar" "-DrepositoryId=ossrh" "-Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/" "-DstagingRepositoryId=ossrh" "-Dsources=PrebidMobile-sources.jar" "-Djavadoc=PrebidMobile-javadoc.jar" || { echoX "Deploy failed!"; echoX "End Script"; exit 1; } 
 
 
 

diff --git a/Maven/pom.xml b/Maven/pom.xml
@@ -26,6 +26,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.prebid</groupId>
     <artifactId>prebid-mobile-sdk</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <packaging>jar</packaging>
 </project>
diff --git a/PrebidMobile/DemoApp/build.gradle b/PrebidMobile/DemoApp/build.gradle
@@ -22,6 +22,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 repositories {

diff --git a/PrebidMobile/DemoApp/src/main/java/org/prebid/mobile/demoapp/Constants.java b/PrebidMobile/DemoApp/src/main/java/org/prebid/mobile/demoapp/Constants.java
@@ -6,7 +6,7 @@ public class Constants {
     public static final String BANNER_300x250 = "Banner_300x250";
     // MoPub Banner
     public static final String MOPUB_AD_UNIT_ID_1 = "1819c823abe34641812d1fc2d1c78920";
-    public static final String MOPUB_AD_UNIT_ID_2 = "bcef78630d754295a1a7757b434941d1";
+    public static final String MOPUB_AD_UNIT_ID_2 = "a9cb8ff85fef4b50b457e3b11119aabf";
     public static final String MOPUB_BANNER_ADUNIT_ID = "Mopub_Ad_Unit_ID";
     public static final String INTERSTITIAL_ADUNIT_ID = "Interstitial_Ad_Unit_ID";
     // DFP Banner

diff --git a/PrebidMobile/PrebidMobileCore/src/main/java/org/prebid/mobile/core/LogUtil.java b/PrebidMobile/PrebidMobileCore/src/main/java/org/prebid/mobile/core/LogUtil.java
@@ -40,7 +40,7 @@ private LogUtil() {
     static final String BASE_TAG = "Prebid";
 
     /**
-     * Helper method to get Prebid log tag that is <= 23
+     * Helper method to get Prebid log tag that is shorter than 23 characters
      *
      * @param tagSuffix specific tag description
      * @return log tag with "Prebid" prefix

diff --git a/PrebidMobile/build.gradle b/PrebidMobile/build.gradle
@@ -3,7 +3,7 @@
 ext {
     releaseProguardEnabled = false
     debugProguardEnabled = false
-    prebidVersionName = "0.1" // what the version should be?
+    prebidVersionName = "0.0.2"
     prebidVersionCode = 1
     minSDKVersion = 14
     targetSDKVersion = 25

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Get started with Prebid Mobile by creating a Prebid Server account [here](http:/
 Easily include the Prebid Mobile SDK using Maven. Simply add this line to your gradle dependencies:
 
 ```
-compile 'org.prebid:prebid-mobile-sdk:0.0.1'
+compile 'org.prebid:prebid-mobile-sdk:0.0.2'
 ```
 
 

diff --git a/buildprebid.sh b/buildprebid.sh
@@ -217,7 +217,6 @@ CORE_CLASSES+=("BidResponse.java")
 CORE_CLASSES+=("DemandAdapter.java")
 CORE_CLASSES+=("ErrorCode.java")
 CORE_CLASSES+=("InterstitialAdUnit.java")
-CORE_CLASSES+=("KeywordUtil.java")
 CORE_CLASSES+=("LogUtil.java")
 CORE_CLASSES+=("Prebid.java")
 CORE_CLASSES+=("PrebidException.java")
@@ -235,7 +234,8 @@ for classes in "${PREBID_SERVER_CLASSES[@]}"; do
 done
 
 cd $OUTDIR
-javadoc -d Javadoc -protected $FINAL_CLASSES >/dev/null 2>/dev/null
+# disable Javadoc for illegal pacakge name error
+javadoc -d Javadoc -protected $FINAL_CLASSES>$LOGPATH/javadoc.log 2>&1 || die "Build Javadoc failed, check log in $LOGPATH/javadoc.log"
 
 #######
 # End