Partially revert upgrade to AGP 9.0.0

Building is broken on ecrypted filesystems

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta 2026-02-04 15:56:44 +08:00
parent 15b5cef6c2
commit 8d6e68d6f4
4 changed files with 8 additions and 14 deletions

View File

@ -7,7 +7,8 @@ import com.android.build.api.dsl.ApplicationExtension
plugins { plugins {
alias(libs.plugins.android.application) alias(libs.plugins.android.application)
alias(libs.plugins.android.legacy.kapt) alias(libs.plugins.jetbrains.kotlin.android)
alias(libs.plugins.jetbrains.kotlin.kapt)
alias(libs.plugins.google.ksp) alias(libs.plugins.google.ksp)
alias(libs.plugins.jetbrains.kotlin.parcelize) alias(libs.plugins.jetbrains.kotlin.parcelize)
alias(libs.plugins.sonarqube) alias(libs.plugins.sonarqube)

View File

@ -3,16 +3,10 @@
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
*/ */
buildscript {
dependencies {
// https://developer.android.com/build/releases/agp-9-0-0-release-notes#runtime-dependency-on-kotlin-gradle-plugin-upgrade
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
}
}
plugins { plugins {
alias(libs.plugins.android.application) apply false alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.legacy.kapt) apply false alias(libs.plugins.jetbrains.kotlin.android) apply false
alias(libs.plugins.jetbrains.kotlin.kapt) apply false
alias(libs.plugins.google.ksp) apply false alias(libs.plugins.google.ksp) apply false
alias(libs.plugins.jetbrains.kotlin.parcelize) apply false alias(libs.plugins.jetbrains.kotlin.parcelize) apply false
alias(libs.plugins.sonarqube) apply false alias(libs.plugins.sonarqube) apply false

View File

@ -1,9 +1,7 @@
android.nonFinalResIds=false android.nonFinalResIds=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048M --add-opens jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED org.gradle.jvmargs=-Xmx2048M --add-opens jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
systemProp.file.encoding=utf-8 systemProp.file.encoding=utf-8
# https://docs.gradle.org/current/userguide/configuration_cache.html # https://docs.gradle.org/current/userguide/configuration_cache.html
org.gradle.configuration-cache=true org.gradle.configuration-cache=true
android.enableAppCompileTimeRClass=false
android.r8.strictFullModeForKeepRules=false
android.r8.optimizedResourceShrinking=false

View File

@ -5,7 +5,7 @@
[versions] [versions]
acra = "5.13.1" acra = "5.13.1"
agp = "9.0.0" agp = "8.13.2"
appcompat = "1.7.1" appcompat = "1.7.1"
assertj = "3.27.6" assertj = "3.27.6"
autoservice-google = "1.1.1" autoservice-google = "1.1.1"
@ -132,7 +132,8 @@ zacsweers-autoservice-compiler = { module = "dev.zacsweers.autoservice:auto-serv
[plugins] [plugins]
android-application = { id = "com.android.application", version.ref = "agp" } android-application = { id = "com.android.application", version.ref = "agp" }
android-legacy-kapt = { id = "com.android.legacy-kapt", version.ref = "agp" } # Needed for statesaver
google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
jetbrains-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } # Needed for statesaver
jetbrains-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } jetbrains-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" } sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }