Release 3.1.0

Author: UnitySteven

Diff for: Makefile

@@ -48,7 +48,7 @@ dismantle-adb-reverse:
 	adb reverse --remove-all
 
 javadoc:
-	./gradlew :lib:generateReleaseJavadoc
+	./gradlew :lib:javadoc
 
 zip: release
 	cp lib/build/outputs/aar/unity-ads-release.aar unity-ads.aar

Diff for: README.md

@@ -1,19 +1,31 @@
-# Unity Ads 3 Android Release Repository
+# unity-ads-android
+Unity Ads Android Development Repository
 
-Welcome to the Unity Ads 3 Android release repository.
+### Execute unit tests
 
-## Binaries
+1. Connect Android device or simulator
+1. `make test`
+1. Coverage report available at `lib/build/reports/coverage/debug/index.html`
 
-Binaries can be found from the [releases tab](https://github.com/Unity-Technologies/unity-ads-android/releases).
+### Build example application
 
-## Integration Guide
+1. `./gradlew assemble`
+1. Find example app in the `app/build/outputs/apk/` subfolder
 
-Integration guide can be found [here](https://github.com/Unity-Technologies/unity-ads-android/wiki/sdk_android_integration_guide). There is [integration tutorial video](https://www.youtube.com/watch?v=MNdJ0KWlYPw) on YouTube.
+### Releasing
 
-## API Reference
+Step 1. Make a staged commit by removing ./publish_to_public.sh from the end of .travis.yml
 
-API Reference can be found [here](https://github.com/Unity-Technologies/unity-ads-android/wiki/sdk_android_api_reference)
+Step 2. Tag the release, push tag to internal repository, Travis will automatically publish a release in internal repository under the releases tab
 
-## Transition guide from Unity Ads 1.5
+Step 3. Final testing with QA
 
-Transition guide from Unity Ads 1.5 can be found [here](https://github.com/Unity-Technologies/unity-ads-android/wiki/sdk_android_transition_guide)
+Step 4. Add ./publish_to_public.sh back to .travis.yml, re-tag the release and push tag
+
+#### Updating staged binaries
+
+If issues are found during testing or other changes need to be made before pushing the release to public repository, you need to update the staged binaries.
+
+Step 1. Delete the release from internal repository
+
+Step 2. Continue with release steps 2 and 3

Diff for: app/build.gradle

@@ -8,8 +8,8 @@ android {
     applicationId "com.unity3d.ads.example"
     minSdkVersion 14
     targetSdkVersion 26
-    versionCode = 3003
-    versionName = "3.0.3"
+    versionCode = 3100
+    versionName = "3.1.0"
   }
 
   flavorDimensions "arEnabled"

Diff for: app/src/main/java/com/unity3d/ads/example/UnityAdsExample.java

@@ -44,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
 			WebView.setWebContentsDebuggingEnabled(true);
 		}
 
-		UnityAds.setListener(unityAdsListener);
+		UnityAds.addListener(unityAdsListener);
 		UnityAds.setDebugMode(true);
 
 		MediationMetaData mediationMetaData = new MediationMetaData(this);

Diff for: app/src/main/java/com/unity3d/ads/example/UnityMonetizationExample.java

@@ -12,13 +12,10 @@
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.unity3d.ads.UnityAds;
 import com.unity3d.ads.metadata.MediationMetaData;
-import com.unity3d.ads.metadata.MetaData;
 import com.unity3d.ads.metadata.PlayerMetaData;
 
 import com.unity3d.services.UnityServices;
@@ -30,7 +27,6 @@
 import com.unity3d.services.core.webview.WebView;
 import com.unity3d.services.monetization.IUnityMonetizationListener;
 import com.unity3d.services.monetization.UnityMonetization;
-import com.unity3d.services.monetization.placementcontent.ads.IShowAdListener;
 import com.unity3d.services.monetization.placementcontent.ads.ShowAdListenerAdapter;
 import com.unity3d.services.monetization.placementcontent.ads.ShowAdPlacementContent;
 import com.unity3d.services.monetization.placementcontent.core.PlacementContent;

Diff for: build.gradle

@@ -9,6 +9,8 @@ buildscript {
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
+    classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
+    classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'  
   }
 }
 

Diff for: lib/build.gradle

@@ -1,4 +1,33 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.jfrog.bintray'
+apply plugin: 'com.github.dcendents.android-maven'
+
+ext {
+    bintrayRepo = "UnityAds"
+    bintrayName = "unityads"
+
+    publishedGroupId = 'com.unity3d.ads'
+    libraryName = 'unity-ads'
+    artifact = 'unity-ads'
+    archivesBaseName = 'unity-ads'
+
+    libraryDescription = 'Monetize your entire player base and reach new audiences with video ads.'
+
+    siteUrl = 'https://github.com/Unity-Technologies/unity-ads-android'
+    gitUrl = 'https://github.com/Unity-Technologies/unity-ads-android.git'
+
+    libraryVersion = '3.0.3'
+
+    developerId = 'sbankhead'
+    developerName = 'Steven Bankhead'
+    developerEmail = '[email protected]'
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+version = libraryVersion
 
 android {
   compileSdkVersion 26
@@ -21,14 +50,14 @@ android {
     All SDK with version numbers with last two digits >= 50 will be treated
     as China SDK for filtering in the backend.
     */
-    versionCode = 3003
-    versionName = "3.0.3"
+    versionCode = 3100
+    versionName = "3.1.0"
 
     setProperty("archivesBaseName", "unity-ads")
 
     buildConfigField 'String', 'WEBVIEW_BRANCH', getPropertyStringWithDefaultValue('WEBVIEW_BRANCH', '"' + versionName + '"')
 
-    testBuildType "coverage"
+    testBuildType "debug"
 
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     testInstrumentationRunnerArguments disableAnalytics: 'true' // Won't work yet, see: https://code.google.com/p/android/issues/detail?id=188241
@@ -57,6 +86,14 @@ android {
       buildConfigField 'String', 'WEBVIEW_BRANCH', getPropertyStringWithDefaultValue('WEBVIEW_BRANCH', '"development"')
     }
   }
+
+  libraryVariants.all { variant ->
+        variant.outputs.all { output ->
+            if (outputFile != null && outputFileName.endsWith('.aar')) {
+                outputFileName = "${archivesBaseName}-release.aar"
+            }
+        }
+    }
 }
 
 dependencies {
@@ -74,21 +111,74 @@ android.testVariants.all { variant ->
   }
 }
 
-android.libraryVariants.all { variant ->
-    task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
-        description "Generates Javadoc for $variant.name."
-        source = variant.javaCompiler.source
+task javadoc(type: Javadoc, overwrite: true) {
+        description "Generates Javadoc for Release"
+        source = android.sourceSets.main.java.srcDirs
         ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
         doFirst {
-          classpath = files(variant.javaCompiler.classpath.files) + files(ext.androidJar)
+          classpath = project.files(android.getBootClasspath().join(File.pathSeparator)) + files(ext.androidJar)
         }
-		options {
-		       links "http://docs.oracle.com/javase/7/docs/api/"
-		       linksOffline "http://developer.android.com/reference","${android.sdkDirectory}/docs/reference"
+    options {
+           links "http://docs.oracle.com/javase/7/docs/api/"
+           linksOffline "http://developer.android.com/reference","${android.sdkDirectory}/docs/reference"
         }
         exclude '**/R.java'
         exclude 'com/unity3d/services/ar/view/GLSurfaceView.java'
-		destinationDir = file("../javadoc/")
+        exclude 'com/unity3d/services/ar/api/AR.java'
+        exclude 'com/unity3d/services/ar/view/ARView.java'
+        exclude 'com/unity3d/services/ar/view/ARViewHandler.java'
+        destinationDir = file("../javadoc/")
+    }
+
+task androidJavadocsJar(type: Jar, dependsOn: javadoc) {
+    classifier = "javadoc"
+    baseName = "${archivesBaseName}"
+    from javadoc.destinationDir
+}
+
+task androidSourcesJar(type: Jar) {
+    classifier = "sources"
+    baseName = "${archivesBaseName}"
+    from android.sourceSets.main.java.srcDirs
+}
+
+artifacts {
+    archives androidJavadocsJar
+    archives androidSourcesJar
+}
+
+task localProperties { 
+  if (!file("$rootDir/local.properties").exists()) {
+    file("$rootDir/local.properties").withWriterAppend { w -> "" }
+  }
+}
+
+// Bintray
+bintray {
+    Properties properties = new Properties()
+    properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
+    user = properties.getProperty("bintray.user")
+    key = properties.getProperty("bintray.apikey")
+
+    configurations = ['archives']
+    pkg {
+        repo = bintrayRepo
+        name = bintrayName
+        desc = libraryDescription
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        licenses = allLicenses
+        publish = true
+        publicDownloadNumbers = false
+        version {
+            desc = libraryDescription
+            gpg {
+                sign = true //Determines whether to GPG sign the files. The default is false
+                passphrase = properties.getProperty("bintray.gpg.password")
+                //Optional. The passphrase for GPG signing'
+            }
+        }
     }
 }
 
@@ -101,3 +191,7 @@ def getPropertyStringWithDefaultValue(String key, String defaultValue) {
   }
   return value != null ? value : defaultValue
 }
+
+if (project.rootProject.file('local.properties').exists()) {
+    apply from: 'mavenPomBintrayUpload.gradle'
+}

Diff for: lib/src/androidTest/java/com/unity3d/ads/test/UnitTestSuite.java

@@ -1,45 +1,49 @@
 package com.unity3d.ads.test;
 
 import com.unity3d.ads.test.unit.*;
+import com.unity3d.services.ads.properties.AdsPropertiesTests;
+import com.unity3d.services.analytics.UnityAnalyticsTest;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-  AdUnitActivityTest.class,
-  AdvertisingIdentifierTest.class,
-  BroadcastTest.class,
-  CacheTest.class,
-  ClientPropertiesTest.class,
-  ConnectivityTest.class,
-  DeviceTest.class,
-  EventIdTest.class,
-  EnvironmentCheckTest.class,
-  EventIdTest.class,
-  InitializeThreadTest.class,
-  InvocationTest.class,
-  MetaDataTest.class,
-  NativeCallbackTest.class,
-  PackageManagerTest.class,
-  PlacementTest.class,
-  PublicApiTest.class,
-  RequestTest.class,
-  SdkPropertiesTest.class,
-  StorageDiskTest.class,
-  StorageGeneralTest.class,
-  StorageMemoryTest.class,
-  VideoViewTest.class,
-  WebViewAppTest.class,
-  WebViewBridgeInterfaceTest.class,
-  WebViewBridgeTest.class,
-  WebViewCallbackTest.class,
-  LifecycleListenerTest.class,
-  VolumeChangeTest.class,
-  UtilitiesTest.class,
-  WebPlayerTest.class,
-  PreferencesTest.class,
-  WebRequestThreadPoolTest.class
+	AdUnitActivityTest.class,
+	AdvertisingIdentifierTest.class,
+	BroadcastTest.class,
+	CacheTest.class,
+	ClientPropertiesTest.class,
+	ConnectivityTest.class,
+	DeviceTest.class,
+	EventIdTest.class,
+	EnvironmentCheckTest.class,
+	EventIdTest.class,
+	InitializeThreadTest.class,
+	InvocationTest.class,
+	MetaDataTest.class,
+	NativeCallbackTest.class,
+	PackageManagerTest.class,
+	PlacementTest.class,
+	PublicApiTest.class,
+	RequestTest.class,
+	SdkPropertiesTest.class,
+	StorageDiskTest.class,
+	StorageGeneralTest.class,
+	StorageMemoryTest.class,
+	VideoViewTest.class,
+	WebViewAppTest.class,
+	WebViewBridgeInterfaceTest.class,
+	WebViewBridgeTest.class,
+	WebViewCallbackTest.class,
+	LifecycleListenerTest.class,
+	VolumeChangeTest.class,
+	UtilitiesTest.class,
+	WebPlayerTest.class,
+	PreferencesTest.class,
+	WebRequestThreadPoolTest.class,
+	UnityAnalyticsTest.class,
+	AdsPropertiesTests.class
 })
 
 public class UnitTestSuite {}

Diff for: lib/src/androidTest/java/com/unity3d/ads/test/unit/ClientPropertiesTest.java

@@ -17,6 +17,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 import static org.junit.Assert.*;
 
 @RunWith(AndroidJUnit4.class)
@@ -32,7 +36,13 @@ public void resetTests () {
 		ClientProperties.setApplicationContext(null);
 		ClientProperties.setActivity(null);
 		ClientProperties.setGameId(null);
-		AdsProperties.setListener(null);
+		this.removeListeners();
+	}
+
+	private void removeListeners() {
+		for (IUnityAdsListener listener : AdsProperties.getListeners()) {
+			AdsProperties.removeListener(listener);
+		}
 	}
 
 	@Test
@@ -88,8 +98,8 @@ public void onUnityAdsError(UnityAds.UnityAdsError error, String message) {
 			}
 		};
 
-		AdsProperties.setListener(listener);
-		assertEquals("Listener was not the same as expected", listener, AdsProperties.getListener());
+		AdsProperties.addListener(listener);
+		assertEquals("Listener was not the same as expected", new HashSet<>(Arrays.asList(listener)), AdsProperties.getListeners());
 	}
 
 	public class MockActivity extends Activity {

Diff for: lib/src/androidTest/java/com/unity3d/ads/test/unit/DeviceTest.java

@@ -94,6 +94,11 @@ public void testNetworkOperatorName () {
 		assertNotNull("Expected network operator name to be something else than null", Device.getNetworkOperatorName());
 	}
 
+	@Test
+	public void testNetworkCountryISO () {
+		assertNotNull("Expected network operator name to be something else than null", Device.getNetworkCountryISO());
+	}
+
 	@Test
 	public void testGetFreeSpace () {
 		assertTrue("There should be space left in the SDK cache directory", Device.getFreeSpace(SdkProperties.getCacheDirectory()) > 0);