upgrade gecko. gradle, deps

This commit is contained in:
Fabian Freund
2026-07-09 15:30:34 +02:00
parent 7a2998857f
commit 277585fc05
41 changed files with 166 additions and 157 deletions
@@ -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'
}
@@ -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
@@ -57,6 +57,10 @@ class WebExtensionPromptFeature(
state.webExtensionPromptRequest
}.distinctUntilChanged().collect { promptRequest ->
when (promptRequest) {
is WebExtensionPromptRequest.InstallationRequested -> {
consumePromptRequest()
}
is WebExtensionPromptRequest.AfterInstallation -> {
handleAfterInstallationRequest(promptRequest)
}