upgrade gecko. gradle, deps

packages/flutter_mozilla_components/android/build.gradle

@@ -2,16 +2,14 @@ group = "eu.weblibre.flutter_mozilla_components"
 version = "1.0-SNAPSHOT"
 
 buildscript {
-    ext.kotlin_version = "2.3.21"
-    ext.mozillaComponentsVersion = '151.0.2'
+    ext.mozillaComponentsVersion = '152.0.4'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.13.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+        classpath("com.android.tools.build:gradle:9.2.1")
     }
 }
 
@@ -36,24 +34,19 @@ rootProject.allprojects {
 }
 
 apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
 
 android {
     if (project.android.hasProperty("namespace")) {
         namespace = "eu.weblibre.flutter_mozilla_components"
     }
 
-    compileSdk = 36
+    compileSdk = 37
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-
     sourceSets {
         main.java.srcDirs += "src/main/kotlin"
         test.java.srcDirs += "src/test/kotlin"
@@ -80,6 +73,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
 configurations.configureEach {
     exclude group: "org.mozilla.telemetry", module: "glean-native"
     // Exclude standalone tink to avoid duplicate classes with tink-android
@@ -139,7 +138,7 @@ dependencies {
     implementation "org.mozilla.components:lib-publicsuffixlist:$mozillaComponentsVersion"
     implementation "org.mozilla.components:service-firefox-accounts:$mozillaComponentsVersion"
     implementation "org.mozilla.components:support-appservices:$mozillaComponentsVersion"
-    implementation "org.ironfoxoss.unifiedpush:unifiedpush:151.0.0"
+    implementation "org.ironfoxoss.unifiedpush:unifiedpush:$mozillaComponentsVersion"
     implementation ('org.unifiedpush.android:connector:3.3.3') {
         exclude group: 'com.google.protobuf', module: 'protobuf-java'
     }

packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/activities/IntentReceiverActivity.kt

@@ -544,7 +544,7 @@ class IntentReceiverActivity : Activity() {
         val components = GlobalComponents.components
 
         for (appTask in activityManager.appTasks) {
-            val baseIntent = runCatching { appTask.taskInfo.baseIntent }
+            val baseIntent = runCatching { appTask.taskInfo?.baseIntent }
                 .getOrElse { error ->
                     Log.w(TAG, "Failed to inspect app task", error)
                     return@getOrElse null

packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/addons/WebExtensionPromptFeature.kt

@@ -57,6 +57,10 @@ class WebExtensionPromptFeature(
                 state.webExtensionPromptRequest
             }.distinctUntilChanged().collect { promptRequest ->
                 when (promptRequest) {
+                    is WebExtensionPromptRequest.InstallationRequested -> {
+                        consumePromptRequest()
+                    }
+
                     is WebExtensionPromptRequest.AfterInstallation -> {
                         handleAfterInstallationRequest(promptRequest)
                     }

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

@@ -1,13 +1,12 @@
 plugins {
     id "com.android.application"
-    id "kotlin-android"
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
 
 android {
     namespace = "eu.weblibre.flutter_mozilla_components_example"
-    compileSdk = flutter.compileSdkVersion
+    compileSdk = 37
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
@@ -15,16 +14,12 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
-
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "eu.weblibre.flutter_mozilla_components_example"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = flutter.minSdkVersion
+        minSdk = 26
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
@@ -39,6 +34,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
 flutter {
     source = "../.."
 }

packages/flutter_mozilla_components/example/android/gradle.properties

@@ -1,3 +1,5 @@
 org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
+android.builtInKotlin=false
+android.newDsl=false

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

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip

packages/flutter_mozilla_components/example/android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.13.2" apply false
-    id "org.jetbrains.kotlin.android" version "2.3.21" apply false
+    id "com.android.application" version "9.2.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.4.0" apply false
 }
 
 include ":app"