Skip to content

Commit 427a314

Browse files
Update androidGradle to v9 (major) (#272)
* Update androidGradle to v9 * Migrate to new source dir syntax * Temporary disable android.newDsl and android.builtInKotlin * Remove obsolete gradle properties --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Thomas Wirth <thomas-w-@web.de>
1 parent d4079d4 commit 427a314

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

gradle.properties

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ org.gradle.jvmargs=-Xmx3g -Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:SoftRefLRUPolic
44
kotlin.daemon.jvmargs=-Xmx3g -Dfile.encoding=UTF-8 -XX:+UseG1GC -XX:SoftRefLRUPolicyMSPerMB=1 -XX:ReservedCodeCacheSize=320m -XX:+HeapDumpOnOutOfMemoryError
55
# Controls whether Gradle should print a welcome message
66
org.gradle.welcome=never
7-
# Allow usage of AndroidX instead of the old support libraries.
8-
android.useAndroidX=true
9-
# Disable Dokka Gradle plugin V1 deprecation warning until stable v2 is available
10-
org.jetbrains.dokka.experimental.gradle.pluginMode.nowarn=true
7+
8+
# TODO remove and migrate once detekt v2 supports AGP9 https://github.com/detekt/detekt/issues/8981
9+
android.newDsl=false
10+
android.builtInKotlin=false
11+
android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.newDsl,android.builtInKotlin
12+
kotlin.suppressGradlePluginWarnings=DeprecatedKotlinAndroidPlugin

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ androidconfig-compileSdk = "36"
66
androidconfig-targetSdk = "36"
77
androidconfig-buildTools = "36.1.0"
88

9-
androidGradle = "8.13.2"
9+
androidGradle = "9.0.0"
1010
kotlin = "2.3.0"
1111

1212
appcompat = "1.7.1"

quickie/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ android {
1919
create("unbundled").dimension = "mlkit"
2020
}
2121
sourceSets {
22-
getByName("bundled").java.srcDirs("src/bundled/kotlin")
23-
getByName("unbundled").java.srcDirs("src/unbundled/kotlin")
22+
getByName("bundled").java.directories.add("src/bundled/kotlin")
23+
getByName("unbundled").java.directories.add("src/unbundled/kotlin")
2424
}
2525
publishing {
2626
singleVariant("bundledRelease")

0 commit comments

Comments
 (0)