feat: update dependencies in the demo apps #25

ValentinPostindustria · ValentinPostindustria · commit 0e0098f6ed9e · 2025-10-07T16:58:36.000+02:00
Migrate the latest version of Google Mobile Ads. Rewrite PublisherAdView to new AdManagerAdView. Import the latest version of the Optable SDK in the demo apps. Add testing application ID.
diff --git a/DemoApp/DemoAppJava/app/build.gradle b/DemoApp/DemoAppJava/app/build.gradle
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         applicationId "co.optable.demoappjava"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 34
 
         versionCode versioning.getVersionCode()
@@ -40,24 +40,24 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.gms:play-services-ads:19.3.0'
-    implementation "com.github.Optable:optable-android-sdk:" + versioning.getVersionName(false)
+    // Optable SDK
+    // TODO: Return to this version after release
+//    implementation "com.github.Optable:optable-android-sdk:" + versioning.getVersionName(false)
+    implementation "com.github.Optable:optable-android-sdk:feature~upgrade_to_new_versions-SNAPSHOT"
 
+
+    // Google Mobile Ads
+    implementation 'com.google.android.gms:play-services-ads:24.6.0'
+
+    // Base Android
     implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.21"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
     implementation 'com.android.support:multidex:1.0.3'
-    implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'androidx.navigation:navigation-fragment:2.1.0'
     implementation 'androidx.navigation:navigation-ui:2.1.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
 
-    testImplementation 'junit:junit:4.12'
+    // Testing
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
diff --git a/DemoApp/DemoAppJava/app/src/main/AndroidManifest.xml b/DemoApp/DemoAppJava/app/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="co.optable.demoappjava">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -10,6 +13,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
+
         <activity
             android:exported="true"
             android:name="co.optable.demoappjava.MainActivity"
@@ -20,11 +24,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <meta-data
-            android:name="com.google.android.gms.ads.AD_MANAGER_APP"
-            android:value="true" />
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-1875909575462531~6255590079" />
+
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/MainActivity.java b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/MainActivity.java
@@ -1,15 +1,13 @@
 package co.optable.demoappjava;
 
 import android.os.Bundle;
-
-import com.google.android.material.bottomnavigation.BottomNavigationView;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
 import co.optable.android_sdk.OptableSDK;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 public class MainActivity extends AppCompatActivity {
     public static OptableSDK OPTABLE;
@@ -19,7 +17,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        MainActivity.OPTABLE = new OptableSDK(this.getApplicationContext(), "sandbox.optable.co", "android-sdk-demo");
+        MainActivity.OPTABLE = new OptableSDK(this.getApplicationContext(), "sandbox.optable.co", "ios-sdk-demo");
 
         BottomNavigationView navView = findViewById(R.id.nav_view);
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
diff --git a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/GAMBanner/GAMBannerFragment.java b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/GAMBanner/GAMBannerFragment.java
@@ -6,29 +6,28 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-
-import com.google.android.gms.ads.doubleclick.PublisherAdRequest;
-import com.google.android.gms.ads.doubleclick.PublisherAdView;
-
-import java.util.HashMap;
-import java.util.List;
-
 import co.optable.android_sdk.OptableSDK;
 import co.optable.demoappjava.MainActivity;
 import co.optable.demoappjava.R;
+import com.google.android.gms.ads.AdRequest;
+import com.google.android.gms.ads.admanager.AdManagerAdRequest;
+import com.google.android.gms.ads.admanager.AdManagerAdView;
+
+import java.util.HashMap;
+import java.util.List;
 
 public class GAMBannerFragment extends Fragment {
-    private PublisherAdView mPublisherAdView;
+
+    private AdManagerAdView mAdView;
     private TextView targetingDataView;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_gambanner, container, false);
-        mPublisherAdView = root.findViewById(R.id.publisherAdView);
+        mAdView = root.findViewById(R.id.publisherAdView);
         targetingDataView = root.findViewById(R.id.targetingDataView);
 
         // loadAdButton loads targeting data and then the GAM banner:
@@ -37,7 +36,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
             targetingDataView.setText("");
 
             MainActivity.OPTABLE.targeting().observe(getViewLifecycleOwner(), result -> {
-                PublisherAdRequest.Builder adRequest = new PublisherAdRequest.Builder();
+                AdManagerAdRequest.Builder adRequest = new AdManagerAdRequest.Builder();
                 final StringBuilder msg = new StringBuilder();
                 msg.append(targetingDataView.getText().toString());
 
@@ -52,7 +51,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
                 }
 
                 targetingDataView.setText(msg.toString());
-                mPublisherAdView.loadAd(adRequest.build());
+                mAdView.loadAd(adRequest.build());
                 profile();
                 witness();
             });
@@ -62,7 +61,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
         btn = root.findViewById(R.id.loadAdButton2);
         btn.setOnClickListener(view -> {
             targetingDataView.setText("");
-            PublisherAdRequest.Builder adRequest = new PublisherAdRequest.Builder();
+            AdRequest.Builder adRequest = new AdRequest.Builder();
             final StringBuilder msg = new StringBuilder();
             HashMap<String, List<String>> data = MainActivity.OPTABLE.targetingFromCache();
 
@@ -77,7 +76,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
             }
 
             targetingDataView.setText(msg.toString());
-            mPublisherAdView.loadAd(adRequest.build());
+            mAdView.loadAd(adRequest.build());
             profile();
             witness();
         });
diff --git a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/Identify/IdentifyFragment.java b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/Identify/IdentifyFragment.java
@@ -8,10 +8,8 @@
 import android.widget.EditText;
 import android.widget.Switch;
 import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-
 import co.optable.android_sdk.OptableSDK;
 import co.optable.demoappjava.MainActivity;
 import co.optable.demoappjava.R;
@@ -30,20 +28,22 @@ public View onCreateView(@NonNull LayoutInflater inflater,
         gaidSwitch = root.findViewById(R.id.gaidSwitch);
 
         Button btn = root.findViewById(R.id.identifyButton);
-        btn.setOnClickListener(view ->
+        btn.setOnClickListener(view -> {
+                    identifyView.setText("");
                 MainActivity.OPTABLE
-                    .identify(emailText.getText().toString(), gaidSwitch.isChecked())
-                    .observe(getViewLifecycleOwner(), result -> {
-                        String msg = "Calling identify API... ";
-
-                        if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-                            msg += "Success";
-                        } else {
-                            msg += "\n\nOptableSDK Error: " + result.getMessage();
-                        }
-
-                        identifyView.setText(msg);
-                    })
+                        .identify(emailText.getText().toString(), gaidSwitch.isChecked())
+                        .observe(getViewLifecycleOwner(), result -> {
+                            String msg = "Calling identify API... ";
+
+                            if (result.getStatus() == OptableSDK.Status.SUCCESS) {
+                                msg += "Success";
+                            } else {
+                                msg += "\n\nOptableSDK Error: " + result.getMessage();
+                            }
+
+                            identifyView.setText(msg);
+                        });
+                }
         );
 
         return root;
diff --git a/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_gambanner.xml b/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_gambanner.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".ui.GAMBanner.GAMBannerFragment">
 
-    <com.google.android.gms.ads.doubleclick.PublisherAdView
+    <com.google.android.gms.ads.admanager.AdManagerAdView
         android:id="@+id/publisherAdView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -18,7 +18,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.494"
-        app:layout_constraintStart_toStartOf="parent"></com.google.android.gms.ads.doubleclick.PublisherAdView>
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/loadAdButton"
@@ -64,4 +64,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/loadAdButton" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/DemoApp/DemoAppKotlin/app/build.gradle b/DemoApp/DemoAppKotlin/app/build.gradle
@@ -9,9 +9,8 @@ android {
     namespace "co.optable.androidsdkdemo"
 
     defaultConfig {
-        // TODO: Change
         applicationId "co.optable.androidsdkdemo"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 34
 
         versionCode versioning.getVersionCode()
@@ -41,24 +40,23 @@ android {
 }
 
 dependencies {
+    // Optable SDK
+    // TODO: Return to this version after release
+//    implementation "com.github.Optable:optable-android-sdk:" + versioning.getVersionName(false)
+    implementation "com.github.Optable:optable-android-sdk:feature~upgrade_to_new_versions-SNAPSHOT"
+
+    // Google Mobile Ads
+    implementation 'com.google.android.gms:play-services-ads:24.6.0'
+
+    // Base Android
     implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.21"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
     implementation 'com.android.support:multidex:1.0.3'
-    implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.navigation:navigation-fragment:2.1.0'
-    implementation 'androidx.navigation:navigation-ui:2.1.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
 
-    testImplementation 'junit:junit:4.12'
+    // Testing
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
-    implementation 'com.google.android.gms:play-services-ads:19.3.0'
-    implementation "com.github.Optable:optable-android-sdk:" + versioning.getVersionName(false)
 }
diff --git a/DemoApp/DemoAppKotlin/app/src/main/AndroidManifest.xml b/DemoApp/DemoAppKotlin/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
+
         <activity
             android:exported="true"
             android:name="co.optable.androidsdkdemo.MainActivity"
@@ -23,8 +24,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <meta-data
-            android:name="com.google.android.gms.ads.AD_MANAGER_APP"
-            android:value="true" />
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-1875909575462531~6255590079" />
+
     </application>
 </manifest>
diff --git a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/GAMBanner/GAMBannerFragment.kt b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/GAMBanner/GAMBannerFragment.kt
@@ -15,12 +15,12 @@ import androidx.lifecycle.Observer
 import co.optable.android_sdk.OptableSDK
 import co.optable.androidsdkdemo.MainActivity
 import co.optable.androidsdkdemo.R
-import com.google.android.gms.ads.doubleclick.PublisherAdRequest
-import com.google.android.gms.ads.doubleclick.PublisherAdView
+import com.google.android.gms.ads.admanager.AdManagerAdRequest
+import com.google.android.gms.ads.admanager.AdManagerAdView
 
 class GAMBannerFragment : Fragment() {
 
-    private lateinit var mPublisherAdView: PublisherAdView
+    private lateinit var mAdView: AdManagerAdView
     private lateinit var targetingDataView: TextView
 
     override fun onCreateView(
@@ -29,7 +29,7 @@ class GAMBannerFragment : Fragment() {
             savedInstanceState: Bundle?
     ): View? {
         val root = inflater.inflate(R.layout.fragment_gambanner, container, false)
-        mPublisherAdView = root.findViewById(R.id.publisherAdView)
+        mAdView = root.findViewById(R.id.publisherAdView)
         targetingDataView = root.findViewById(R.id.targetingDataView)
         targetingDataView.setText("")
 
@@ -38,7 +38,7 @@ class GAMBannerFragment : Fragment() {
         btn.setOnClickListener {
             MainActivity.OPTABLE!!.targeting().observe(viewLifecycleOwner, Observer { result ->
                 var msg = ""
-                var adRequest = PublisherAdRequest.Builder()
+                var adRequest = AdManagerAdRequest.Builder()
 
                 if (result.status == OptableSDK.Status.SUCCESS) {
                     msg += "Loading GAM ad with targeting data:\n\n"
@@ -51,7 +51,7 @@ class GAMBannerFragment : Fragment() {
                 }
 
                 targetingDataView.setText(msg)
-                mPublisherAdView.loadAd(adRequest.build())
+                mAdView.loadAd(adRequest.build())
                 profile()
                 witness()
             })
@@ -61,7 +61,7 @@ class GAMBannerFragment : Fragment() {
         btn = root.findViewById(R.id.loadAdButton2) as Button
         btn.setOnClickListener {
             var msg = ""
-            var adRequest = PublisherAdRequest.Builder()
+            var adRequest = AdManagerAdRequest.Builder()
             var data = MainActivity.OPTABLE!!.targetingFromCache()
 
             if (data != null) {
@@ -75,7 +75,7 @@ class GAMBannerFragment : Fragment() {
             }
 
             targetingDataView.setText(msg)
-            mPublisherAdView.loadAd(adRequest.build())
+            mAdView.loadAd(adRequest.build())
             profile()
             witness()
         }
diff --git a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/Identify/IdentifyFragment.kt b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/Identify/IdentifyFragment.kt
@@ -35,6 +35,7 @@ class IdentifyFragment : Fragment() {
 
         var btn = root.findViewById(R.id.identifyButton) as Button
         btn.setOnClickListener {
+            identifyView.text = ""
             MainActivity.OPTABLE!!
                 .identify(emailText.text.toString(), gaidSwitch.isChecked)
                 .observe(viewLifecycleOwner, Observer
diff --git a/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_gambanner.xml b/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_gambanner.xml
