From d7e635782b0afd0d2562ce005280db6d29abf959 Mon Sep 17 00:00:00 2001 From: Fabian Freund Date: Fri, 6 Feb 2026 05:31:14 +0100 Subject: [PATCH] upgrade android deps --- app/android/app/build.gradle | 2 +- app/android/build.gradle | 9 ++++++++- app/android/gradle/wrapper/gradle-wrapper.properties | 2 +- app/android/settings.gradle | 4 ++-- packages/flutter_mozilla_components/android/build.gradle | 6 +++--- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 4 ++-- packages/flutter_tor/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/flutter_tor/example/android/settings.gradle.kts | 2 +- packages/locale_resolver/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../locale_resolver/example/android/settings.gradle.kts | 4 ++-- packages/simple_intent_receiver/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle.kts | 4 ++-- packages/speech_to_text_dialog/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle.kts | 2 +- 19 files changed, 32 insertions(+), 25 deletions(-) diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle index 613cd5ac..024d9879 100644 --- a/app/android/app/build.gradle +++ b/app/android/app/build.gradle @@ -1,7 +1,7 @@ plugins { id "com.android.application" id "kotlin-android" - id "org.jetbrains.kotlin.plugin.compose" version "2.1.20" + id "org.jetbrains.kotlin.plugin.compose" version "2.2.20" // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. id "dev.flutter.flutter-gradle-plugin" } diff --git a/app/android/build.gradle b/app/android/build.gradle index 16558ecf..31825c66 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -5,7 +5,7 @@ ext { } buildscript { - ext.kotlin_version = '2.1.20' + ext.kotlin_version = '2.2.20' } allprojects { @@ -20,6 +20,13 @@ allprojects { rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" + afterEvaluate { + if (it.hasProperty("android")) { + android { + compileSdkVersion 36 + } + } + } } subprojects { project.evaluationDependsOn(":app") diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index e6045a98..0922d266 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/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.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip diff --git a/app/android/settings.gradle b/app/android/settings.gradle index 940ea578..5061c737 100644 --- a/app/android/settings.gradle +++ b/app/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.11.1' apply false - id "org.jetbrains.kotlin.android" version "2.1.20" apply false + id "com.android.application" version '8.13.2' apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } include ":app" diff --git a/packages/flutter_mozilla_components/android/build.gradle b/packages/flutter_mozilla_components/android/build.gradle index dfff91ca..848a016e 100644 --- a/packages/flutter_mozilla_components/android/build.gradle +++ b/packages/flutter_mozilla_components/android/build.gradle @@ -2,7 +2,7 @@ group = "eu.weblibre.flutter_mozilla_components" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.1.20" + ext.kotlin_version = "2.2.20" ext.mozillaComponentsVersion = '147.0.2' repositories { @@ -135,8 +135,8 @@ dependencies { implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'com.google.android.material:material:1.13.0' //https://stackoverflow.com/questions/73782320/onbackinvokedcallback-is-not-enabled-for-the-application-in-set-androidenableo - implementation 'androidx.activity:activity-ktx:1.12.2' - implementation 'androidx.paging:paging-runtime-ktx:3.3.6' + implementation 'androidx.activity:activity-ktx:1.12.3' + implementation 'androidx.paging:paging-runtime-ktx:3.4.0' testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.mockito:mockito-core:5.15.2") diff --git a/packages/flutter_mozilla_components/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter_mozilla_components/example/android/gradle/wrapper/gradle-wrapper.properties index 1c6634c7..0922d266 100644 --- a/packages/flutter_mozilla_components/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/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.13.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip diff --git a/packages/flutter_mozilla_components/example/android/settings.gradle b/packages/flutter_mozilla_components/example/android/settings.gradle index 69400c06..c9996f61 100644 --- a/packages/flutter_mozilla_components/example/android/settings.gradle +++ b/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.11.1" apply false - id "org.jetbrains.kotlin.android" version "2.1.20" apply false + id "com.android.application" version "8.13.2" apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } include ":app" diff --git a/packages/flutter_tor/android/build.gradle b/packages/flutter_tor/android/build.gradle index 0ceb3083..45078333 100644 --- a/packages/flutter_tor/android/build.gradle +++ b/packages/flutter_tor/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:8.11.1") + classpath("com.android.tools.build:gradle:8.13.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") } } diff --git a/packages/flutter_tor/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/flutter_tor/example/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb..0922d266 100644 --- a/packages/flutter_tor/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/flutter_tor/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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip diff --git a/packages/flutter_tor/example/android/settings.gradle.kts b/packages/flutter_tor/example/android/settings.gradle.kts index ca7fe065..7368634c 100644 --- a/packages/flutter_tor/example/android/settings.gradle.kts +++ b/packages/flutter_tor/example/android/settings.gradle.kts @@ -19,7 +19,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false + id("com.android.application") version "8.13.2" apply false id("org.jetbrains.kotlin.android") version "2.2.20" apply false } diff --git a/packages/locale_resolver/android/build.gradle b/packages/locale_resolver/android/build.gradle index 25c9a226..8519b342 100644 --- a/packages/locale_resolver/android/build.gradle +++ b/packages/locale_resolver/android/build.gradle @@ -2,7 +2,7 @@ group = "eu.weblibre.locale_resolver" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.1.20" + ext.kotlin_version = "2.2.20" repositories { google() mavenCentral() diff --git a/packages/locale_resolver/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/locale_resolver/example/android/gradle/wrapper/gradle-wrapper.properties index 1c6634c7..0922d266 100644 --- a/packages/locale_resolver/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/locale_resolver/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.13.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip diff --git a/packages/locale_resolver/example/android/settings.gradle.kts b/packages/locale_resolver/example/android/settings.gradle.kts index fb605bc8..7368634c 100644 --- a/packages/locale_resolver/example/android/settings.gradle.kts +++ b/packages/locale_resolver/example/android/settings.gradle.kts @@ -19,8 +19,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.9.1" apply false - id("org.jetbrains.kotlin.android") version "2.1.0" apply false + id("com.android.application") version "8.13.2" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false } include(":app") diff --git a/packages/simple_intent_receiver/android/build.gradle b/packages/simple_intent_receiver/android/build.gradle index 3ae5259a..ec4a41ef 100644 --- a/packages/simple_intent_receiver/android/build.gradle +++ b/packages/simple_intent_receiver/android/build.gradle @@ -2,7 +2,7 @@ group = "eu.weblibre.simple_intent_receiver" version = "1.0-SNAPSHOT" buildscript { - ext.kotlin_version = "2.1.20" + ext.kotlin_version = "2.2.20" repositories { google() mavenCentral() diff --git a/packages/simple_intent_receiver/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/simple_intent_receiver/example/android/gradle/wrapper/gradle-wrapper.properties index 1c6634c7..0922d266 100644 --- a/packages/simple_intent_receiver/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/simple_intent_receiver/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.13.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip diff --git a/packages/simple_intent_receiver/example/android/settings.gradle.kts b/packages/simple_intent_receiver/example/android/settings.gradle.kts index 3a22d2d5..3281b683 100644 --- a/packages/simple_intent_receiver/example/android/settings.gradle.kts +++ b/packages/simple_intent_receiver/example/android/settings.gradle.kts @@ -18,8 +18,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false - id("org.jetbrains.kotlin.android") version "2.1.20" apply false + id("com.android.application") version "8.13.2" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false } include(":app") diff --git a/packages/speech_to_text_dialog/android/build.gradle b/packages/speech_to_text_dialog/android/build.gradle index 651a1583..fffcb4ec 100644 --- a/packages/speech_to_text_dialog/android/build.gradle +++ b/packages/speech_to_text_dialog/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:8.11.1") + classpath("com.android.tools.build:gradle:8.13.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") } } diff --git a/packages/speech_to_text_dialog/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/speech_to_text_dialog/example/android/gradle/wrapper/gradle-wrapper.properties index e4ef43fb..0922d266 100644 --- a/packages/speech_to_text_dialog/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/speech_to_text_dialog/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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip diff --git a/packages/speech_to_text_dialog/example/android/settings.gradle.kts b/packages/speech_to_text_dialog/example/android/settings.gradle.kts index ca7fe065..7368634c 100644 --- a/packages/speech_to_text_dialog/example/android/settings.gradle.kts +++ b/packages/speech_to_text_dialog/example/android/settings.gradle.kts @@ -19,7 +19,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.1" apply false + id("com.android.application") version "8.13.2" apply false id("org.jetbrains.kotlin.android") version "2.2.20" apply false }