Release 4.6.0

Author: runner

app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "com.unity3d.ads.example"
         minSdkVersion 19
-        targetSdkVersion 30
-        versionCode = 4500
-        versionName = "4.5.0"
+        targetSdkVersion 32
+        versionCode = 4600
+        versionName = "4.6.0"
     }
 
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -10,7 +10,8 @@
         <activity
             android:name=".UnityAdsTestApp"
             android:label="@string/title_activity_unity_ads_test_app"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

build.gradle

@@ -10,6 +10,9 @@ buildscript {
         kotlin_version = '1.4.32' // 1.5 deprecated Java6
         coroutines_version = '1.4.3' // 1.6.0 deprecated Java6
         dokka_version = '1.6.10'
+        startup_runtime_version = '1.1.1'
+        unity_identifiers_version = '1.0.0'
+        lifecycle_version = '2.5.1'
     }
 
     repositories {
@@ -18,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.1.3'
         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'

fatAar.gradle

@@ -1,21 +1,40 @@
-task deleteOldJar(type: Delete) {
-    delete("../unity-ads/libs/${project.name}.jar")
-}
-
-def copyJarTask(buildType) {
+def copyJarTask(String buildType) {
     return tasks.create("copyJars${buildType}", Copy.class) {
-        from("build/intermediates/compile_library_classes_jar/${buildType}/")
-        into('../unity-ads/libs/')
+        from(tasks.getByName("bundleLibCompileToJar${buildType}"))
+        into("../unity-ads/libs/${buildType}/")
         include('classes.jar')
         rename('classes.jar', "${project.name}.jar")
-    }.dependsOn(deleteOldJar)
+    }
+}
+
+static def tasksDependentOnScar(String buildType) {
+    return [
+        "copy${buildType}JniLibsProjectAndLocalJars",
+        "compile${buildType}Kotlin",
+        "merge${buildType}JavaResource",
+        "sync${buildType}LibJars",
+        "extract${buildType}Annotations",
+        "dokkaJavadoc"
+    ]
 }
 
 project.tasks.whenTaskAdded { Task theTask ->
-    if (theTask.name == 'bundleLibCompileToJarRelease') {
-        theTask.finalizedBy(copyJarTask("release"))
-    }
-    if (theTask.name == 'bundleLibCompileToJarDebug') {
-        theTask.finalizedBy(copyJarTask("debug"))
+    {
+        ["Release", "Debug"].each { buildType ->
+            {
+                if (theTask.name == "bundleLibCompileToJar${buildType}") {
+                    if (project.name != "unity-ads") {
+                        theTask.finalizedBy(copyJarTask("${buildType}"))
+                    }
+                }
+                if (tasksDependentOnScar("${buildType}").any { theTask.name == it }) {
+                    theTask.dependsOn(":unity-scaradapter-common:copyJars${buildType}")
+                    theTask.dependsOn(":unity-scaradapter-1920:copyJars${buildType}")
+                    theTask.dependsOn(":unity-scaradapter-1950:copyJars${buildType}")
+                    theTask.dependsOn(":unity-scaradapter-2000:copyJars${buildType}")
+                    theTask.dependsOn(":unity-scaradapter-2100:copyJars${buildType}")
+                }
+            }
+        }
     }
 }

gradle.properties

@@ -17,6 +17,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.useAndroidX=true
+android.disableAutomaticComponentCreation=true
 
 signing.keyId=34500891
 signing.secretKeyRingFile=../gpg-private-key.gpg

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

unity-ads/build.gradle

@@ -2,6 +2,7 @@ import com.android.ddmlib.DdmPreferences
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply from: '../fatAar.gradle'
 apply from: '../dokka.gradle'
 
 Properties properties = new Properties()
@@ -12,28 +13,31 @@ if (project.rootProject.file('local.properties').exists()) {
 ext {
   GROUP_ID = "com.unity3d.ads"
   ARTIFACT_ID = "unity-ads"
-  VERSION_ID = "4.5.0"
-  VERSION_CODE = 4500
+  VERSION_ID = "4.6.0"
+  VERSION_CODE = 4600
   SIGN_AAR = properties.getProperty("SIGN_AAR") ?: false
 }
 
 android {
-  compileSdkVersion 30
+  namespace = GROUP_ID
+  compileSdkVersion 32
   DdmPreferences.setLogLevel("verbose")
   DdmPreferences.setTimeOut(10 * 60000)
 
-  defaultPublishConfig "release"
-
   lintOptions {
     abortOnError false
   }
 
   defaultConfig {
+    targetSdkVersion 32
     minSdkVersion 19
-    targetSdkVersion 30
     versionCode = VERSION_CODE
     versionName = VERSION_ID
-
+    gradle.startParameter.taskNames.each {
+      if (it.contains("AndroidTest")) {
+          minSdkVersion 26
+      }
+    }
     setProperty("archivesBaseName", "unity-ads")
 
     buildConfigField('String', 'WEBVIEW_BRANCH', getPropertyStringWithDefaultValue('WEBVIEW_BRANCH', '"' + versionName + '"'))
@@ -87,10 +91,14 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    debugImplementation fileTree(dir: 'libs/Debug', include: ['*.jar'])
+    releaseImplementation fileTree(dir: 'libs/Release', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
-    androidTestCompileOnly project(':unity-scaradapter-2100')    
+    implementation "androidx.startup:startup-runtime:$startup_runtime_version"
+    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
+    implementation "com.unity3d.services.identifiers:unity-services-identifiers:$unity_identifiers_version"
+    androidTestCompileOnly project(':unity-scaradapter-2100')
     androidTestCompileOnly project(':unity-scaradapter-2000')
     androidTestCompileOnly project(':unity-scaradapter-1950')
     androidTestCompileOnly project(':unity-scaradapter-1920')
@@ -100,10 +108,10 @@ dependencies {
     androidTestImplementation 'org.mockito:mockito-android:2.25.0'
     // A bug in Mockito requires us to add this until an update in released
     androidTestImplementation 'org.opentest4j:opentest4j:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'com.google.android.gms:play-services-ads:19.5.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test:rules:1.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'com.google.android.gms:play-services-ads:21.4.0'
     androidTestImplementation 'com.android.billingclient:billing:4.0.0'
     compileOnly 'com.google.ar:core:1.0.0'
     compileOnly project(':unity-scaradapter-2100')
@@ -120,6 +128,8 @@ dependencies {
     testImplementation 'com.android.billingclient:billing:4.0.0'
     testImplementation "io.mockk:mockk:1.11.0"
     testImplementation 'org.json:json:20180813'
+    testImplementation 'org.powermock:powermock-api-mockito2:2.0.2'
+    testImplementation 'org.powermock:powermock-module-junit4:2.0.2'
 }
 
 task androidSourcesJar(type: Jar) {

unity-ads/jacoco.gradle

@@ -10,8 +10,8 @@ tasks.withType(Test) {
 
 task jacocoTestReport(type: JacocoReport) {
     reports {
-        xml.enabled = true
-        html.enabled = true
+        xml.getRequired().set(true)
+        html.getRequired().set(true)
     }
 
     def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']

unity-ads/proguard-rules.pro

@@ -17,4 +17,15 @@
 # Keep all classes in Unity Services package
 -keep class com.unity3d.services.** {
    *;
-}
+}
+
+-keep class com.google.android.gms.ads.initialization.** {
+        *;
+}
+
+-keep class com.google.android.gms.ads.MobileAds {
+        *;
+}
+
+-dontwarn com.google.ads.mediation.admob.*
+-dontwarn com.google.android.gms.ads.**

unity-ads/src/androidTest/java/com/unity3d/ads/test/InstrumentationTestSuite.java

@@ -11,36 +11,22 @@
 import com.unity3d.ads.test.instrumentation.services.ads.webplayer.WebPlayerViewCacheTest;
 import com.unity3d.ads.test.instrumentation.services.ads.webplayer.WebPlayerViewSettingsCacheTest;
 import com.unity3d.ads.test.instrumentation.services.banners.BannerViewCacheTests;
-import com.unity3d.ads.test.instrumentation.services.core.configuration.ExperimentObjectTest;
-import com.unity3d.ads.test.instrumentation.services.core.configuration.ExperimentObjectsTest;
-import com.unity3d.ads.test.instrumentation.services.core.configuration.ExperimentsReaderTest;
-import com.unity3d.ads.test.instrumentation.services.core.configuration.ExperimentsTest;
 import com.unity3d.ads.test.instrumentation.services.core.configuration.InitializationNotificationCenterTest;
-import com.unity3d.ads.test.instrumentation.services.core.configuration.PrivacyConfigStatusTest;
-import com.unity3d.ads.test.instrumentation.services.core.configuration.PrivacyConfigStorageTest;
-import com.unity3d.ads.test.instrumentation.services.core.configuration.PrivacyConfigTest;
 import com.unity3d.ads.test.instrumentation.services.core.device.AsyncTokenStorageTest;
 import com.unity3d.ads.test.instrumentation.services.core.device.DeviceInfoReaderCompressorTest;
 import com.unity3d.ads.test.instrumentation.services.core.device.DeviceInfoReaderFilterProviderTest;
 import com.unity3d.ads.test.instrumentation.services.core.device.DeviceInfoReaderWithFilterTest;
-import com.unity3d.ads.test.instrumentation.services.core.device.DeviceInfoReaderWithPIITest;
 import com.unity3d.ads.test.instrumentation.services.core.device.DeviceInfoReaderWithStorageInfoTest;
 import com.unity3d.ads.test.instrumentation.services.core.device.NativeTokenGeneratorTest;
-import com.unity3d.ads.test.instrumentation.services.core.device.pii.PiiDataSelectorTest;
-import com.unity3d.ads.test.instrumentation.services.core.device.pii.PiiDecisionDataTest;
-import com.unity3d.ads.test.instrumentation.services.core.device.pii.PiiTrackingStatusReaderTest;
 import com.unity3d.ads.test.instrumentation.services.core.misc.IntervalTimerTest;
-import com.unity3d.ads.test.instrumentation.services.core.misc.JsonFlattenerTest;
 import com.unity3d.ads.test.instrumentation.services.core.webview.WebViewUrlBuilderTest;
 import com.unity3d.ads.test.instrumentation.services.core.webview.bridge.WebViewBridgeSharedObjectTests;
 import com.unity3d.ads.test.instrumentation.services.core.webview.bridge.invocation.WebViewBridgeInvocationRunnableTests;
-import com.unity3d.ads.test.instrumentation.services.core.webview.bridge.invocation.WebViewBridgeInvocationTests;
 import com.unity3d.ads.test.instrumentation.services.store.gpbl.bridges.PurchasesResultBridgeTest;
 import com.unity3d.ads.test.legacy.ConfigurationTest;
 import com.unity3d.services.analytics.AcquisitionTypeTest;
 import com.unity3d.services.analytics.UnityAnalyticsTest;
 import com.unity3d.services.core.request.metrics.MetricCommonTagsTest;
-import com.unity3d.services.core.request.metrics.MetricsContainerTest;
 import com.unity3d.services.core.timer.BaseTimerTest;
 
 import org.junit.runner.RunWith;
@@ -51,19 +37,11 @@
 	UnityAnalyticsTest.class,
 	AcquisitionTypeTest.class,
 	InitializationNotificationCenterTest.class,
-	ExperimentObjectTest.class,
-	ExperimentObjectsTest.class,
-	ExperimentsTest.class,
-	ExperimentsReaderTest.class,
-	PrivacyConfigStatusTest.class,
-	PrivacyConfigStorageTest.class,
-	PrivacyConfigTest.class,
 	WebViewUrlBuilderTest.class,
 	WebPlayerViewSettingsCacheTest.class,
 	WebPlayerViewCacheTest.class,
 	BannerViewCacheTests.class,
 	WebViewBridgeSharedObjectTests.class,
-	WebViewBridgeInvocationTests.class,
 	WebViewBridgeInvocationRunnableTests.class,
 	LoadOperationTests.class,
 	LoadModuleTests.class,
@@ -76,18 +54,12 @@
 	GmaScarTestSuite.class,
 	AsyncTokenStorageTest.class,
 	NativeTokenGeneratorTest.class,
-	PiiTrackingStatusReaderTest.class,
-	PiiDecisionDataTest.class,
-	PiiDataSelectorTest.class,
 	DeviceInfoReaderCompressorTest.class,
 	DeviceInfoReaderFilterProviderTest.class,
 	DeviceInfoReaderWithStorageInfoTest.class,
-	DeviceInfoReaderWithPIITest.class,
 	DeviceInfoReaderWithFilterTest.class,
-	JsonFlattenerTest.class,
 	PurchasesResultBridgeTest.class,
 	MetricCommonTagsTest.class,
-	MetricsContainerTest.class,
 	IntervalTimerTest.class,
 	BaseTimerTest.class
 })