Skip to content

Commit 20acf08

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents cfa491c + 217bc42 commit 20acf08

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

gradle.properties

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,13 @@ kotlin.daemon.jvmargs=-Xmx8G
1212
#Android
1313
android.useAndroidX=true
1414
android.nonTransitiveRClass=true
15+
android.defaults.buildfeatures.resvalues=true
16+
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
17+
android.enableAppCompileTimeRClass=false
18+
android.usesSdkInManifest.disallowed=false
19+
android.uniquePackageNames=false
20+
android.dependency.useConstraints=true
21+
android.r8.strictFullModeForKeepRules=false
22+
android.r8.optimizedResourceShrinking=false
23+
android.builtInKotlin=false
24+
android.newDsl=false

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlin = "2.3.0"
3-
ksp = "2.3.0"
4-
agp = "8.13.2"
3+
ksp = "2.3.2"
4+
agp = "9.0.0"
55

66
#https://github.com/JetBrains/compose-multiplatform/releases
77
composeMultiplatform = "1.9.3"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon Dec 11 12:09:16 CET 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)