Merge pull request #767 from prebid/752-update-gma-version-to-newest

Update GMA Version to 23.1.0
prebid · Jun 20, 2024 · a52642b · a52642b
2 parents 027fde2 + cf14b77
commit a52642b
Show file tree

Hide file tree

Showing 63 changed files with 812 additions and 75 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,15 +7,18 @@ version: 2.1
 # Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
 # See: https://circleci.com/docs/2.0/orb-intro/
 orbs:
-  android: circleci/android@1.0.3
+  android: circleci/android@2.5.0
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
   android-test:
     executor:
       name: android/android-machine
+      tag: default
     steps:
       - checkout
+      - android/change-java-version:
+          java-version: 17
       - android/start-emulator-and-run-tests:
           post-emulator-launch-assemble-command: ./gradlew PrebidDemoKotlin:assembleAndroidTest
           test-command: ./gradlew PrebidDemoKotlin:connectedDebugAndroidTest
@@ -29,12 +32,14 @@ jobs:
         type: string
     executor:
       name: android/android-machine
-
+      tag: default
     # Add steps to the job
     # See: https://circleci.com/docs/2.0/configuration-reference/#steps
     steps:
       # Checkout the code as the first step.
       - checkout
+      - android/change-java-version:
+          java-version: 17
       - run:
           command: << parameters.buildCommand >>
 
@@ -44,11 +49,14 @@ jobs:
     # See: https://circleci.com/docs/2.0/executor-types/
     executor:
       name: android/android-machine
+      tag: default
     # Add steps to the job
     # See: https://circleci.com/docs/2.0/configuration-reference/#steps
     steps:
       # Checkout the code as the first step.
       - checkout
+      - android/change-java-version:
+          java-version: 17
       # And finally run the release build
       - run:
           name: Test Frameworks

diff --git a/Example/PrebidDemoJava/build.gradle b/Example/PrebidDemoJava/build.gradle
@@ -1,11 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    setCompileSdkVersion(33)
+    namespace "org.prebid.mobile.javademo"
+    setCompileSdkVersion(34)
     setBuildToolsVersion("30.0.3")
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0.0"
         applicationId "org.prebid.mobile.javademo"
@@ -14,8 +15,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     buildFeatures {
         dataBinding true

diff --git a/Example/PrebidDemoJava/src/main/AndroidManifest.xml b/Example/PrebidDemoJava/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.prebid.mobile.javademo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Required permissions -->
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/Example/PrebidDemoKotlin/build.gradle b/Example/PrebidDemoKotlin/build.gradle
@@ -2,20 +2,21 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    setCompileSdkVersion(33)
+    namespace "org.prebid.mobile.prebidkotlindemo"
+    setCompileSdkVersion(34)
     setBuildToolsVersion("30.0.3")
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0.0"
         applicationId "org.prebid.mobile.prebidkotlindemo"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     buildFeatures {
         dataBinding true

diff --git a/Example/PrebidDemoKotlin/src/main/AndroidManifest.xml b/Example/PrebidDemoKotlin/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.prebid.mobile.prebidkotlindemo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Required permissions -->
     <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/Example/PrebidInternalTestApp/build.gradle b/Example/PrebidInternalTestApp/build.gradle
@@ -19,11 +19,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    setCompileSdkVersion(33)
+    namespace "org.prebid.mobile.renderingtestapp"
+    setCompileSdkVersion(34)
     setBuildToolsVersion("30.0.3")
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0.0"
         applicationId "org.prebid.mobile.renderingtestapp"
@@ -40,11 +41,11 @@ android {
         exclude 'LICENSE.txt'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     adbOptions {
         timeOutInMs 5 * 60 * 1000 // 5 minutes

diff --git a/Example/PrebidInternalTestApp/src/main/AndroidManifest.xml b/Example/PrebidInternalTestApp/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.prebid.mobile.renderingtestapp">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/.../org/prebid/mobile/renderingtestapp/plugplay/utilities/consent/ConsentSettingsFragment.kt b/.../org/prebid/mobile/renderingtestapp/plugplay/utilities/consent/ConsentSettingsFragment.kt
@@ -32,9 +32,9 @@ class ConsentSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.On
         getDefaultSharedPreference()?.registerOnSharedPreferenceChangeListener(this)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
 
-        when (val preference = findPreference<Preference>(key)) {
+        when (val preference = key?.let { findPreference<Preference>(it) }) {
             is IntegerEditTextPreferenceWithValue ->
                 preference.summary = sharedPreferences?.getInt(key, -1).toString()
             is EditTextPreferenceWithValue ->

diff --git a/PrebidMobile/PrebidMobile-admobAdapters/build.gradle b/PrebidMobile/PrebidMobile-admobAdapters/build.gradle
@@ -3,8 +3,15 @@ apply from: '../publisher.gradle'
 apply from: '../tests.gradle'
 
 android {
+    namespace "org.prebid.mobile.admob.adapters"
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 21
+    }
+    testOptions {
+        unitTests.all {
+            jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
+            systemProperty 'robolectric.invokedynamic.enable', 'false'
+        }
     }
 }
 

diff --git a/PrebidMobile/PrebidMobile-admobAdapters/src/main/AndroidManifest.xml b/PrebidMobile/PrebidMobile-admobAdapters/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="org.prebid.mobile.admob.adapters"/>
+<manifest/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<manifest package="org.prebid.mobile.admob.adapters"/>
		<manifest/>