From 98c127bbb365f97e243e8faf3c1a6ff230ca4f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 6 Nov 2026 20:57:56 +0100 Subject: [PATCH] Android: Update Gradle to 9.9.0, AGP to 9.5.1, protobuf to 4.36.2 protoc was still on 3.25.3 while the runtime was on 4.x; both are now 4.36.2. appcompat stays at 1.7.1, since 1.8.0 needs minSdk 23. Co-Authored-By: Claude Opus 5.5 --- android/build.gradle.kts | 9 ++++----- build.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 4ddb43ce00..656497a809 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -58,17 +58,16 @@ val gitVersionCode = commitsSinceTag dependencies { - // 1.6.1 is the newest version we can use that won't complain about minSdk version, - // and also doesn't collide kotlin versions with com.gladed.androidgitversion. - // Will replace with a different plugin soon. + // appcompat 1.8.0 and later need minSdk 23. implementation("androidx.appcompat:appcompat:1.7.1") implementation("androidx.documentfile:documentfile:1.1.0") - implementation("com.google.protobuf:protobuf-javalite:4.35.1") + // Keep the runtime and protoc versions in step. + implementation("com.google.protobuf:protobuf-javalite:4.36.2") } protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.25.3" + artifact = "com.google.protobuf:protoc:4.36.2" } generateProtoTasks { diff --git a/build.gradle.kts b/build.gradle.kts index b1a0884fb3..b496fd5d5b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ plugins { - id("com.android.application") version "9.5.0" apply false - id("com.google.protobuf") version "0.10.0" apply false + id("com.android.application") version "9.5.1" apply false + id("com.google.protobuf") version "0.10.1" apply false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b2eeda23ea..7cdca83086 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Oct 14 18:07:36 CEST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists