Android Gradle update | UMP - Support for new Debug Geography enums (#1223)

* UMP - Support for new Debug Geography enums

* Changed deprecated members

* Adjusted to the new double values for Colors

Author: LTPhantom

packages/google_mobile_ads/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## Next Version
 * Updated WebView Flutter Android dependency 
+* Adds support for the new Debug Geography enums for the UMP SDK
 
 ## 5.2.0
 * Removed use of rootViewController for iOS GMA SDK which solved issues like 

packages/google_mobile_ads/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.3.2'
     }
 }
 
@@ -41,9 +41,9 @@ android {
         implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
         implementation 'com.google.errorprone:error_prone_annotations:2.16'
         testImplementation 'junit:junit:4.13.2'
-        testImplementation 'org.hamcrest:hamcrest:2.2'
-        testImplementation 'org.mockito:mockito-inline:5.2.0'
-        testImplementation 'org.robolectric:robolectric:4.10.3'
+        testImplementation 'org.hamcrest:hamcrest:3.0'
+        testImplementation 'org.mockito:mockito-core:5.15.2'
+        testImplementation 'org.robolectric:robolectric:4.14.1'
         testImplementation 'androidx.test:core:1.5.0'
     }
     testOptions {

packages/google_mobile_ads/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat May 13 14:37:03 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

packages/google_mobile_ads/example/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,9 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
     compileSdkVersion 34
 
@@ -52,8 +50,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaLanguageVersion.of(17)
+        targetCompatibility JavaLanguageVersion.of(17)
     }
 }
 
@@ -62,7 +60,10 @@ flutter {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.robolectric:robolectric:4.14.1'
+    testImplementation 'org.mockito:mockito-core:5.15.2'
+    androidTestImplementation 'org.robolectric:robolectric:4.10.3'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

packages/google_mobile_ads/example/android/build.gradle

@@ -1,14 +1,3 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
-    }
-}
-
 allprojects {
     repositories {
         google()

packages/google_mobile_ads/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat May 13 14:40:00 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

packages/google_mobile_ads/example/android/settings.gradle

@@ -1,15 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withInputStream { stream -> plugins.load(stream) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.3.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
+
+include ":app"

packages/google_mobile_ads/example/ios/RunnerTests/FLTUserMessagingPlatformReaderWriterTest.m

@@ -69,7 +69,7 @@ - (void)testConsentDebugSettings_default {
 
 - (void)testConsentDebugSettings_geographyTestDeviceIdentifiers {
   UMPDebugSettings *debugSettings = [[UMPDebugSettings alloc] init];
-  debugSettings.geography = UMPDebugGeographyNotEEA;
+  debugSettings.geography = UMPDebugGeographyOther;
   debugSettings.testDeviceIdentifiers = @[ @"id-1", @"id-2" ];
   NSData *encodedMessage = [messageCodec encode:debugSettings];
 

packages/google_mobile_ads/example/pubspec.yaml

@@ -20,8 +20,8 @@ dependencies:
     sdk: flutter
   google_mobile_ads:
     path: ../
-  webview_flutter_android: ^4.0.0
-  webview_flutter: ^4.0.5
+  webview_flutter_android: ^4.3.0
+  webview_flutter: ^4.10.0
 
 dev_dependencies:
   pedantic: ^1.11.0

packages/google_mobile_ads/lib/src/ad_instance_manager.dart

@@ -22,6 +22,7 @@ import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_mobile_ads/src/ad_inspector_containers.dart';
 import 'package:google_mobile_ads/src/ad_listeners.dart';
@@ -988,10 +989,10 @@ class AdMessageCodec extends StandardMessageCodec {
       writeValue(buffer, value.size);
     } else if (value is Color) {
       buffer.putUint8(_valueColor);
-      writeValue(buffer, value.alpha);
-      writeValue(buffer, value.red);
-      writeValue(buffer, value.green);
-      writeValue(buffer, value.blue);
+      writeValue(buffer, (value.a * 255).toInt());
+      writeValue(buffer, (value.r * 255).toInt());
+      writeValue(buffer, (value.g * 255).toInt());
+      writeValue(buffer, (value.b * 255).toInt());
     } else if (value is NativeTemplateFontStyle) {
       buffer.putUint8(_valueNativeTemplateFontStyle);
       writeValue(buffer, value.index);