From 610d594174577f32da40623202c3cc6bf6fd6d48 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 9 Sep 2025 18:10:00 +0200 Subject: [PATCH 1/2] Revert AGP to 8.11.1 to unblock F-Droid build. Reason: https://github.com/element-hq/element-x-android/issues/3420#issuecomment-3199571010 --- gradle/libs.versions.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b5dc5ecd55..0825c5049e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,8 @@ [versions] # Project -android_gradle_plugin = "8.12.2" +# We cannot use 8.12.+ since it breaks F-Droid build (see https://github.com/element-hq/element-x-android/issues/3420#issuecomment-3199571010) +android_gradle_plugin = "8.11.1" # When updateing this, please also update the version in the file ./idea/kotlinc.xml kotlin = "2.2.10" kotlinpoet = "2.2.0" From 708c7ce7deb3cc5ab8c94ed2edce4f994dab665b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 9 Sep 2025 18:13:20 +0200 Subject: [PATCH 2/2] Comment out the lint version override. We should override only when we have an issue with the lint version defined in AGP. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 08293866a8..18399ccf06 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,7 +41,7 @@ signing.element.nightly.keyPassword=Secret # Customise the Lint version to use a more recent version than the one bundled with AGP # https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html -android.experimental.lint.version=8.12.2 +# android.experimental.lint.version=8.12.2 # Enable test fixture for all modules by default android.experimental.enableTestFixtures=true