Skip to content

Commit 0aebe88

Browse files
authored
297 upgrade agp9 (#298)
* #297 Upgrade agp v9 * #297 Fix KSP build issue
1 parent 6eeba80 commit 0aebe88

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ plugins {
2323
alias(libs.plugins.compose) apply false
2424
}
2525

26+
subprojects {
27+
afterEvaluate {
28+
tasks.withType<Test>().configureEach {
29+
failOnNoDiscoveredTests = false
30+
}
31+
}
32+
}
33+
2634
tasks.register("clean", Delete::class) {
2735
delete(rootProject.layout.buildDirectory)
2836
}

gradle.properties

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,10 @@ org.gradle.configuration-cache.problems=warn
3636
# Disable build features that are enabled by default,
3737
# https://developer.android.com/build/releases/gradle-plugin#default-changes
3838
android.defaults.buildfeatures.resvalues=false
39-
android.defaults.buildfeatures.shaders=false
39+
android.defaults.buildfeatures.shaders=false
40+
# SQLDelight (and other plugins) expect legacy AGP extension types; opt out of new DSL until they support AGP 9 (sqldelight#6078)
41+
android.newDsl=false
42+
# SQLDelight plugin expects KotlinSourceSet "main"; allow legacy source sets until SQLDelight supports AGP 9
43+
android.disallowKotlinSourceSets=false
44+
# Disable AGP's built-in Kotlin to use standalone Kotlin plugin (required for KSP compatibility)
45+
android.builtInKotlin=false

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ projectMinSdkVersionWear = "30"
77
projectTargetSdkVersion = "35"
88
projectCompileSdkVersion = "35"
99

10-
kotlin = "2.1.10"
10+
kotlin = "2.2.21"
1111
kotlinter = "5.4.2"
12-
ksp = "2.1.10-1.0.31"
12+
ksp = "2.2.21-2.0.5"
1313
kotlinxImmutableCollection = "0.4.0"
14-
androidGradlePlugin = "8.13.2" #Last version witout any change in code
14+
androidGradlePlugin = "9.0.1"
1515

1616
ktx = "1.15.0"
1717

@@ -27,7 +27,7 @@ wearToolingPreview = "1.0.0"
2727
horologistComposeLayout = "0.6.17"
2828

2929
detekt = "1.23.8"
30-
hilt = "2.53.1"
30+
hilt = "2.59.1"
3131
androidHiltCompiler = "1.2.0"
3232
hiltNavigationCompose = "1.2.0"
3333
hiltWork = "1.2.0"
@@ -47,7 +47,7 @@ chucker = "4.2.0" #Last version witout any change in code
4747
kotlinx-serialization = "1.10.0"
4848
kotlinx-serialization-converter = "1.0.0"
4949

50-
sqldelight = "2.1.0" #Last version witout any change in code
50+
sqldelight = "2.2.1"
5151

5252
junit = "4.13.2"
5353
junitExt = "1.3.0"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
33
distributionPath=wrapper/dists
44
zipStorePath=wrapper/dists
55
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)