Release: version 3.10.0

adiant · Aug 4, 2015 · 5f3cdab · 5f3cdab
1 parent 7fc9b68
commit 5f3cdab
Show file tree

Hide file tree

Showing 67 changed files with 3,769 additions and 2,281 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## Version 3.10.0 (August 3, 2015)
+
+- VAST UI improvements and bug fixes.
+  - Pause trackers no longer fire when the ad is skipped.
+  - Improved retrieval of blurred video frame when there is no companion ad.
+- Added com.mopub:mopub-sdk AAR to [jCenter](https://bintray.com/mopub/mopub-android-sdk/mopub-android-sdk/view).
+- Bug Fixes:
+  - Fixed a NullPointerException in CacheService on devices with low storage space.
+  - Improved redirect loading for in-app browser.
+
 ## Version 3.9.0 (July 1, 2015)
 
 - Added **VAST 3.0** standard support for video ads.
@@ -8,6 +18,7 @@
   - MRAID video interstitials now play automatically when displayed on Jellybean MR1 and newer.
   - MRAID relative assets are correctly rendered.
   - MoPubLog no longer duplicates some messages.
+  - Fixed erroneous output of DeviceUtils.getScreenOrientationFromRotationAndOrientation().
 
 ## Version 3.8.0 (June 1, 2015)
 

diff --git a/README.md b/README.md
@@ -6,42 +6,66 @@ Sign up for an account at [http://app.mopub.com/](http://app.mopub.com/).
 
 ## Need Help?
 
-You can find integration documentation on our [wiki](https://github.com/mopub/mopub-android-sdk/wiki/Getting-Started) and
-additional help documentation on our [developer help site](http://dev.twitter.com/mopub). 
+You can find integration documentation on our [wiki](https://github.com/mopub/mopub-android-sdk/wiki/Getting-Started) and additional help documentation on our [developer help site](http://dev.twitter.com/mopub).
 
 To file an issue with our team visit the [MoPub Forum](https://twittercommunity.com/c/fabric/mopub) or email [support@mopub.com](mailto:support@mopub.com).
 
-**Please Note: We no longer accept GitHub Issues**
+**Please Note: We no longer accept GitHub Issues.**
 
 ## Download
 
-The MoPub SDK is distributed as source code that you can include in your application.  MoPub provides two prepackaged archives of source code:
-
-- **[MoPub Android Full SDK.zip](http://bit.ly/YUdU9v)**
-
-  Includes everything you need to serve HTML and MRAID MoPub advertisiments *and* built-in support for Millennial Media third party ad network - [Millennial Media](http://www.millennialmedia.com/) - including the required third party binaries.
-
-- **[MoPub Android Base SDK.zip](http://bit.ly/YUdWhH)**
-
-  Includes everything you need to serve HTML and MRAID MoPub advertisements.  No third party ad networks are included.
-
-## Integrate
-
-Integration instructions are available on the [wiki](https://github.com/mopub/mopub-android-sdk/wiki/Getting-Started).
-
+The MoPub SDK is available via:
+
+1. **jCenter AAR**
+
+    [ ![Download](https://api.bintray.com/packages/mopub/mopub-android-sdk/mopub-android-sdk/images/download.svg)](https://bintray.com/mopub/mopub-android-sdk/mopub-android-sdk/_latestVersion)  
+    The MoPub SDK is available as an AAR via jCenter; to use it, add the following to your `build.gradle`.
+
+    ```
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        compile('com.mopub:mopub-sdk:3.10.0@aar') {
+            transitive = true
+        }
+    }
+    ```
+
+    **To continue integration using the mopub-sdk AAR, please see the [Getting Started guide](https://github.com/mopub/mopub-android-sdk/wiki/Getting-Started#updating-your-android-manifest).**
+
+2. **Zipped Source**
+
+    The MoPub SDK is also distributed as zipped source code that you can include in your application.  MoPub provides two prepackaged archives of source code:
+
+    **[MoPub Android Full SDK.zip](http://bit.ly/YUdU9v)**  
+    _Includes everything you need to serve MoPub ads *and* built-in support for Millennial Media third party ad network - [Millennial Media](http://www.millennialmedia.com/) - including the required third party binaries._
+    
+    **[MoPub Android Base SDK.zip](http://bit.ly/YUdWhH)**  
+    _Includes everything you need to serve MoPub ads.  No third party ad networks are included._
+    
+    **For additional integration instructions, please see the [Getting Started guide](https://github.com/mopub/mopub-android-sdk/wiki/Getting-Started#requirements-and-dependencies).**
+
+3. **Cloned GitHub repository**
+    
+    Alternatively, you can obtain the MoPub SDK source by cloning the git repository:
+    
+    `git clone git://github.com/mopub/mopub-android-sdk.git`
+    
+    **For additional integration instructions, please see the [Getting Started guide](https://github.com/mopub/mopub-android-sdk/wiki/Getting-Started#requirements-and-dependencies).**
 
 ## New in this Version
 
-Please view the [changelog](https://github.com/mopub/mopub-android-sdk/blob/master/CHANGELOG.md) for details.
+Please view the [changelog](https://github.com/mopub/mopub-android-sdk/blob/master/CHANGELOG.md) for a complete list of additions, fixes, and enhancements in the lastest release..
 
-- Added **VAST 3.0** standard support for video ads.
-- Improved **video player UX**.
-- Added **RecyclerView** support for native ads. See the [integration guide](https://github.com/mopub/mopub-android-sdk/wiki/Native-Ads-with-Recycler-View).
-- Improved **deep link** handling.
+- VAST UI improvements and bug fixes.
+  - Pause trackers no longer fire when the ad is skipped.
+  - Improved retrieval of blurred video frame when there is no companion ad.
+- Added com.mopub:mopub-sdk AAR to [jCenter](https://bintray.com/mopub/mopub-android-sdk/mopub-android-sdk/view).
 - Bug Fixes:
-  - MRAID video interstitials now play automatically when displayed on Jellybean MR1 and newer.
-  - MRAID relative assets are correctly rendered.
-  - MoPubLog no longer duplicates some messages.
+  - Fixed a NullPointerException in CacheService on devices with low storage space.
+  - Improved redirect loading for in-app browser.
 
 ## Requirements
 

diff --git a/build.gradle b/build.gradle
@@ -6,10 +6,9 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'org.robolectric:robolectric-gradle-plugin:1.1.0'
     }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.2.1'
+    gradleVersion = '2.5'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Nov 18 14:15:01 PST 2014
+#Wed Jul 15 14:33:43 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
diff --git a/mopub-sample/AndroidManifest.xml b/mopub-sample/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.mopub.simpleadsdemo"
-      android:versionCode="26"
-      android:versionName="3.9.0">
+      android:versionCode="27"
+      android:versionName="3.10.0">
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="22"/>
 

diff --git a/mopub-sample/build.gradle b/mopub-sample/build.gradle
@@ -5,16 +5,16 @@ repositories {
 apply plugin: 'com.android.application'
 
 group = 'com.mopub'
-
-description = '''MoPub SDK'''
+description = '''MoPub Sample App'''
+version = '3.10.0'
 
 android {
     compileSdkVersion 22
     buildToolsVersion '22.0.1'
 
     defaultConfig {
-        versionCode 26
-        versionName "3.9.0"
+        versionCode 27
+        versionName version
         minSdkVersion 9
         targetSdkVersion 22
     }

diff --git a/mopub-sdk/build.gradle b/mopub-sdk/build.gradle
@@ -1,23 +1,46 @@
 // This buildscript will assemble the MoPub SDK into an AAR.
 
+buildscript {
+    repositories {
+        mavenCentral()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        classpath 'org.robolectric:robolectric-gradle-plugin:1.1.0'
+    }
+}
+
+plugins {
+    id "com.jfrog.bintray" version "1.2"
+}
+
 repositories {
+    mavenCentral()
     jcenter()
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'org.robolectric'
 
-group = 'com.mopub'
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.5'
+}
 
-description = '''MoPub SDK'''
+group = 'com.mopub'
+description = '''MoPub Android SDK'''
+version = '3.10.0'
 
 android {
     compileSdkVersion 22
     buildToolsVersion '22.0.1'
 
     defaultConfig {
-        versionCode 26
-        versionName "3.9.0"
+        versionCode 27
+        versionName version
         minSdkVersion 9
         targetSdkVersion 22
         consumerProguardFiles 'proguard.txt'
@@ -82,3 +105,108 @@ dependencies {
     testCompile 'com.squareup:fest-android:1.0.7'
     testCompile 'org.mockito:mockito-core:1.9.5'
 }
+
+def siteUrl = 'https://github.com/mopub/mopub-android-sdk'
+def gitUrl = 'https://github.com/mopub/mopub-android-sdk.git'
+// Put your credentials (bintray.user, bintray.apikey) in ~/.gradle/gradle.properties
+bintray {
+    user = project.hasProperty("bintray.user") ? project.getProperty("bintray.user") : ""
+    key = project.hasProperty("bintray.apikey") ? project.getProperty("bintray.apikey") : ""
+
+    configurations = ['archives']
+    publish = true
+
+    pkg {
+        repo = 'mopub-android-sdk'
+        name = 'mopub-android-sdk'
+
+        userOrg = 'mopub'
+        desc = description
+
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = ['Apache-2.0']
+
+        version {
+            name = project.version
+        }
+    }
+}
+
+install {
+    repositories.mavenInstaller {
+        pom {
+            project {
+                packaging 'aar'
+
+                name 'MoPub Android SDK'
+                url siteUrl
+
+                licenses {
+                    license {
+                        name 'MoPub SDK License'
+                        url 'http://www.mopub.com/legal/sdk-license-agreement/'
+                    }
+                }
+                developers {
+                    // ID corresponds to GitHub user name
+                    developer {
+                        id 'nathanshayefar'
+                        name 'Nathan Shayefar'
+                        email 'nshayefar@twitter.com'
+                    }
+                    developer {
+                        id 'joeblubaugh'
+                        name 'Joe Blubaugh'
+                        email 'joeblubaugh@twitter.com'
+                    }
+                    developer {
+                        id 'steffanc'
+                        name 'Steffan Chartrand'
+                        email 'schartrand@twitter.com'
+                    }
+                    developer {
+                        id 'aornelas'
+                        name 'Andrés Ornelas'
+                        email 'andres@twitter.com'
+                    }
+                    developer {
+                        id 'bichenwang'
+                        name 'Bichen Wang'
+                        email 'bwang@twitter.com'
+                    }
+                    developer {
+                        id 'nathank33'
+                        name 'Nathan Braun'
+                        email 'nbraun@twitter.com'
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
diff --git a/mopub-sdk/gradle/wrapper/gradle-wrapper.jar b/mopub-sdk/gradle/wrapper/gradle-wrapper.jar
diff --git a/mopub-sdk/gradle/wrapper/gradle-wrapper.properties b/mopub-sdk/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Mar 20 15:07:53 PDT 2014
+#Fri Jul 24 16:59:31 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
diff --git a/mopub-sdk/src/main/java/com/mopub/common/BrowserWebViewClient.java b/mopub-sdk/src/main/java/com/mopub/common/BrowserWebViewClient.java
@@ -47,34 +47,32 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
             return false;
         }
 
-        try {
-            new UrlHandler.Builder()
-                    .withSupportedUrlActions(SUPPORTED_URL_ACTIONS)
-                    .withoutMoPubBrowser()
-                    .withResultActions(new UrlHandler.ResultActions() {
-                        @Override
-                        public void urlHandlingSucceeded(@NonNull String url,
-                                @NonNull UrlAction urlAction) {
-                            if (urlAction.equals(UrlAction.OPEN_IN_APP_BROWSER)) {
-                                mMoPubBrowser.getWebView().loadUrl(url);
-                            } else {
-                                // UrlAction opened in external app, so close MoPubBrowser
-                                mMoPubBrowser.finish();
-                            }
+        UrlHandler urlHandler = new UrlHandler.Builder()
+                .withSupportedUrlActions(SUPPORTED_URL_ACTIONS)
+                .withoutMoPubBrowser()
+                .withResultActions(new UrlHandler.ResultActions() {
+                    @Override
+                    public void urlHandlingSucceeded(@NonNull String url,
+                            @NonNull UrlAction urlAction) {
+                        if (urlAction.equals(UrlAction.OPEN_IN_APP_BROWSER)) {
+                            mMoPubBrowser.getWebView().loadUrl(url);
+                        } else {
+                            // UrlAction opened in external app, so close MoPubBrowser
+                            mMoPubBrowser.finish();
                         }
-
-                        @Override
-                        public void urlHandlingFailed(@NonNull String url,
-                                @NonNull UrlAction lastFailedUrlAction) { }
-                    })
-                    .build().handleUrl(mMoPubBrowser.getApplicationContext(), url,
-                            true, // = fromUserInteraction
-                            true // = throwExceptionOnFailure
-                        );
-            return true;
-        } catch (IntentNotResolvableException e) {
-            return false;
-        }
+                    }
+
+                    @Override
+                    public void urlHandlingFailed(@NonNull String url,
+                            @NonNull UrlAction lastFailedUrlAction) {
+                    }
+                })
+                .build();
+
+        return urlHandler.handleResolvedUrl(mMoPubBrowser.getApplicationContext(), url,
+                true, // = fromUserInteraction
+                null // = trackingUrls
+        );
     }
 
     @Override