Skip to content

Commit 60e47f2

Browse files
Update to AGP 9.1.0 (#3071)
1 parent 850c2d3 commit 60e47f2

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Check lint
4545
run: ./gradlew lint${{ matrix.flavor }}Release
4646
- name: Run unit tests
47-
run: timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest; }
47+
run: timeout 5m ./gradlew test${{ matrix.flavor }}DebugUnitTest || { ./gradlew --stop && timeout 5m ./gradlew test${{ matrix.flavor }}DebugUnitTest; }
4848
- name: Enable KVM
4949
run: |
5050
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules

app/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
release {
3939
isMinifyEnabled = true
4040
proguardFiles(
41-
getDefaultProguardFile("proguard-android.txt"),
41+
getDefaultProguardFile("proguard-android-optimize.txt"),
4242
"proguard-rules.pro"
4343
)
4444
}
@@ -107,7 +107,6 @@ android {
107107
// Flag to enable support for the new language APIs
108108
isCoreLibraryDesugaringEnabled = true
109109

110-
111110
sourceCompatibility = JavaVersion.VERSION_17
112111
targetCompatibility = JavaVersion.VERSION_17
113112
}

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1414
# AndroidX package structure to make it clearer which packages are bundled with the
1515
# Android operating system, and which are packaged with your app's APK
1616
# https://developer.android.com/topic/libraries/support-library/androidx-rn
17-
android.useAndroidX=true
17+
android.builtInKotlin=false
18+
android.newDsl=false

gradle/libs.versions.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[versions]
22
# AndroidX
33
compose = "2026.03.00"
4+
kotlin = "2.3.20"
45

56
# Third-party
67
acra = "5.13.1"
@@ -52,9 +53,9 @@ junit-junit = { group = "junit", name = "junit", version = "4.13.2" }
5253
org-robolectric-robolectric = { group = "org.robolectric", name = "robolectric", version = "4.16.1" }
5354

5455
[plugins]
55-
com-android-application = { id = "com.android.application", version = "8.13.2" }
56-
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version = "2.3.10" }
57-
org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version = "2.3.10" }
56+
com-android-application = { id = "com.android.application", version = "9.1.0" }
57+
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
58+
org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
5859

5960
[bundles]
6061
acra = ["ch-acra-acra-mail", "ch-acra-acra-dialog"]

0 commit comments

Comments
 (0)