Release 4.5.0

Author: runner

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.unity3d.ads.example"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode = 4410
-        versionName = "4.4.1"
+        versionCode = 4500
+        versionName = "4.5.0"
     }
 
     buildTypes {

build.gradle

@@ -6,16 +6,24 @@ allprojects {
 }
 
 buildscript {
+    ext {
+        kotlin_version = '1.4.32' // 1.5 deprecated Java6
+        coroutines_version = '1.4.3' // 1.6.0 deprecated Java6
+        dokka_version = '1.6.10'
+    }
+
     repositories {
         gradlePluginPortal()
         google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'org.jacoco:org.jacoco.core:0.8.5'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.20.0'
         classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
     }
 }
 

dokka.gradle

@@ -0,0 +1,52 @@
+apply plugin: 'org.jetbrains.dokka'
+
+tasks.dokkaJavadoc.configure {
+
+    def docs = new File("$rootDir/../javadoc/")
+
+    if (!docs.exists()) {
+        docs.mkdir()
+        println(docs.toString())
+    }
+
+    outputDirectory.set(docs)
+
+    def pkgToInclude = [
+        "com.unity3d.ads",
+        "com.unity3d.services",
+    ]
+
+    def fileNamesToExclude = [
+        "R.java"
+    ]
+
+    def filesToExclude = []
+    for (def fileName : fileNamesToExclude) {
+        filesToExclude << "src/main/java/com/unity3d/ads/$fileName"
+    }
+
+    dokkaSourceSets {
+        configureEach {
+            includeNonPublic.set(false)
+            skipEmptyPackages.set(true)
+            reportUndocumented.set(false)
+            jdkVersion.set(7)
+
+            // By default all packages are suppressed.
+            perPackageOption {
+                matchingRegex.set("com.unity3d.*")
+                suppress.set(true)
+            }
+
+            // Reverse suppression for packages to be included.
+            for (def pkg : pkgToInclude) {
+                perPackageOption {
+                    matchingRegex.set(pkg)
+                    suppress.set(false)
+                }
+            }
+
+            suppressedFiles.setFrom(files(filesToExclude))
+        }
+    }
+}

settings.gradle

@@ -1,5 +1,6 @@
 include ':unity-scaradapter-1920'
 include ':unity-scaradapter-1950'
 include ':unity-scaradapter-2000'
+include ':unity-scaradapter-2100'
 include ':unity-scaradapter-common'
 include ':app', ':unity-ads'

unity-ads/build.gradle

@@ -1,6 +1,8 @@
 import com.android.ddmlib.DdmPreferences
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: '../dokka.gradle'
 
 Properties properties = new Properties()
 if (project.rootProject.file('local.properties').exists()) {
@@ -10,8 +12,8 @@ if (project.rootProject.file('local.properties').exists()) {
 ext {
   GROUP_ID = "com.unity3d.ads"
   ARTIFACT_ID = "unity-ads"
-  VERSION_ID = "4.4.1"
-  VERSION_CODE = 4410
+  VERSION_ID = "4.5.0"
+  VERSION_CODE = 4500
   SIGN_AAR = properties.getProperty("SIGN_AAR") ?: false
 }
 
@@ -49,6 +51,27 @@ android {
     targetCompatibility JavaVersion.VERSION_1_7
   }
 
+  tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+      if (it.name.contains("UnitTest")) {
+          sourceCompatibility = JavaVersion.VERSION_1_8
+          targetCompatibility = JavaVersion.VERSION_1_8
+          kotlinOptions {
+              jvmTarget = "1.8"
+          }
+      } else {
+          sourceCompatibility = JavaVersion.VERSION_1_6
+          targetCompatibility = JavaVersion.VERSION_1_6
+          kotlinOptions {
+              jvmTarget = "1.6"
+          }
+      }
+      kotlinOptions {
+          apiVersion = "1.4"
+          languageVersion = "1.4"
+          freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.RequiresOptIn" + "-Xallow-result-return-type"
+      }
+  }
+
   buildTypes {
     release {
       minifyEnabled false
@@ -65,6 +88,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    androidTestCompileOnly project(':unity-scaradapter-2100')    
     androidTestCompileOnly project(':unity-scaradapter-2000')
     androidTestCompileOnly project(':unity-scaradapter-1950')
     androidTestCompileOnly project(':unity-scaradapter-1920')
@@ -80,37 +106,20 @@ dependencies {
     androidTestImplementation 'com.google.android.gms:play-services-ads:19.5.0'
     androidTestImplementation 'com.android.billingclient:billing:4.0.0'
     compileOnly 'com.google.ar:core:1.0.0'
+    compileOnly project(':unity-scaradapter-2100')
     compileOnly project(':unity-scaradapter-2000')
     compileOnly project(':unity-scaradapter-1950')
     compileOnly project(':unity-scaradapter-1920')
     compileOnly project(':unity-scaradapter-common')
     testImplementation 'junit:junit:4.13.2'
+    testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
+    testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
     testImplementation 'org.mockito:mockito-core:2.28.2'
     testImplementation 'com.android.billingclient:billing:4.0.0'
-}
-
-task javadoc(type: Javadoc) {
-    description "Generates Javadoc for Release"
-    source = android.sourceSets.main.java.srcDirs
-    ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-    ext.generatedClass = "build/generated/source/buildConfig/release/"
-    doFirst {
-      classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-      classpath += files(ext.androidJar)
-      classpath += fileTree(dir: 'libs', include: ['*.jar'])
-      classpath += files(ext.generatedClass)
-    }
-    options {
-           links "http://docs.oracle.com/javase/7/docs/api/"
-    }
-    exclude '**/R.java'
-    destinationDir = file("../javadoc/")
-}
-
-task androidJavadocsJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set("javadoc")
-    archiveBaseName.set("${archivesBaseName}")
-    from javadoc.destinationDir
+    testImplementation "io.mockk:mockk:1.11.0"
+    testImplementation 'org.json:json:20180813'
 }
 
 task androidSourcesJar(type: Jar) {
@@ -119,9 +128,15 @@ task androidSourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
 }
 
+task androidJavadocsJar(type: Jar, dependsOn: dokkaJavadoc) {
+    archiveClassifier.set("javadoc")
+    archiveBaseName.set("${archivesBaseName}")
+    from "$rootDir/../javadoc/"
+}
+
 artifacts {
-    archives androidJavadocsJar
     archives androidSourcesJar
+    archives androidJavadocsJar
 }
 
 def getPropertyStringWithDefaultValue(String key, String defaultValue) {

unity-ads/publishing.gradle

@@ -36,6 +36,43 @@ publishing {
                     }
                 }
             }
+
+            pom.withXml {
+                def node = asNode()
+
+                // ugly hack to set the packaging property in the POM as 'aar'
+                ((NodeList) node.get('packaging')).get(0).value = 'aar'
+
+                def dependenciesNode = node.appendNode('dependencies')
+
+                def cl = { Dependency dep ->
+                    if (dep.group == null || dep.version == null || dep.name == null || dep.name == "unspecified")
+                        return // ignore invalid dependencies
+
+                    def dependencyNode = dependenciesNode.appendNode('dependency')
+                    dependencyNode.appendNode('groupId', dep.group)
+                    dependencyNode.appendNode('artifactId', dep.name)
+                    dependencyNode.appendNode('version', dep.version)
+
+                    if (!dep.transitive) {
+                        // If this dependency is transitive, we should force exclude all its dependencies them from the POM
+                        def exclusionNode = dependencyNode.appendNode('exclusions').appendNode('exclusion')
+                        exclusionNode.appendNode('groupId', '*')
+                        exclusionNode.appendNode('artifactId', '*')
+                    } else if (!dep.properties.excludeRules.empty) {
+                        // Otherwise add specified exclude rules
+                        def exclusionNode = dependencyNode.appendNode('exclusions').appendNode('exclusion')
+                        dep.properties.excludeRules.each { ExcludeRule rule ->
+                            exclusionNode.appendNode('groupId', rule.group ?: '*')
+                            exclusionNode.appendNode('artifactId', rule.module ?: '*')
+                        }
+                    }
+                }
+
+                // List all dependencies and write to POM
+                configurations.api.getAllDependencies().each cl
+                configurations.releaseImplementation.getAllDependencies().each cl
+            }
         }
     }
 }

unity-ads/src/androidTest/java/com/unity3d/ads/test/instrumentation/services/ads/gmascar/GmaScarTestSuite.java

@@ -1,6 +1,7 @@
 package com.unity3d.ads.test.instrumentation.services.ads.gmascar;
 
 import com.unity3d.ads.test.instrumentation.services.ads.gmascar.adapters.ScarAdapterFactoryTest;
+import com.unity3d.ads.test.instrumentation.services.ads.gmascar.bridges.MobileAdsBridgeLegacyTest;
 import com.unity3d.ads.test.instrumentation.services.ads.gmascar.finder.GMAInitializerTest;
 import com.unity3d.ads.test.instrumentation.services.ads.gmascar.finder.PresenceDetectorTest;
 import com.unity3d.ads.test.instrumentation.services.ads.gmascar.finder.ScarVersionFinderTest;
@@ -21,6 +22,7 @@
 	AdapterStatusBridgeTest.class,
 	InitializationStatusBridgeTest.class,
 	InitializeListenerBridgeTest.class,
+	MobileAdsBridgeLegacyTest.class,
 	MobileAdsBridgeTest.class
 })
 public class GmaScarTestSuite {

unity-ads/src/androidTest/java/com/unity3d/ads/test/instrumentation/services/ads/gmascar/adapters/ScarAdapterFactoryTest.java

@@ -3,6 +3,7 @@
 import com.unity3d.scar.adapter.common.IAdsErrorHandler;
 import com.unity3d.scar.adapter.common.IScarAdapter;
 import com.unity3d.services.ads.gmascar.adapters.ScarAdapterFactory;
+import com.unity3d.services.ads.gmascar.finder.ScarAdapterVersion;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -19,31 +20,25 @@ public class ScarAdapterFactoryTest {
 
 	@Test
 	public void testScarAdapterFactory1920() {
-		IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterFactory.CODE_19_2, adsErrorHandlerMock);
+		IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterVersion.V192, adsErrorHandlerMock);
 		Assert.assertTrue(adapter instanceof com.unity3d.scar.adapter.v1920.ScarAdapter);
 	}
 
 	@Test
 	public void testScarAdapterFactory1950() {
-		IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterFactory.CODE_19_5, adsErrorHandlerMock);
-		Assert.assertTrue(adapter instanceof com.unity3d.scar.adapter.v1950.ScarAdapter);
-	}
-
-	@Test
-	public void testScarAdapterFactory1980() {
-		IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterFactory.CODE_19_8, adsErrorHandlerMock);
+		IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterVersion.V195, adsErrorHandlerMock);
 		Assert.assertTrue(adapter instanceof com.unity3d.scar.adapter.v1950.ScarAdapter);
 	}
 
 	@Test
 	public void testScarAdapterFactory2000() {
-		IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterFactory.CODE_20_0, adsErrorHandlerMock);
+		IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterVersion.V20, adsErrorHandlerMock);
 		Assert.assertTrue(adapter instanceof com.unity3d.scar.adapter.v2000.ScarAdapter);
 	}
 
 	@Test
 	public void testScarAdapterFactoryUnsupported() {
-		IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(-1, adsErrorHandlerMock);
+		IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterVersion.NA, adsErrorHandlerMock);
 		Assert.assertNull(adapter);
 	}
 }