Skip to content

Commit 16f1f42

Browse files
committed
chore(deps): Centralize compileSdk and targetSdk versions and update various dependencies
Moved compileSdk and targetSdk to libs.versions.toml to centralize dependency management. Updated build.gradle.kts files to reference the new version catalog entries. Updates include: - Gradle wrapper to 8.13 - Android Gradle plugin to 8.12.0 - Compile and Target SDK to 36 - AppCompat to 1.7.1 - Lifecycle ViewModel KTX to 2.9.2 - Kotlin to 2.2.0 - Mockito Core to 5.18.0 - Robolectric to 4.15.1 - Mockk to 1.14.5 - Lint to 31.12.0
1 parent d035c4e commit 16f1f42

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

demo/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ android {
2626
}
2727

2828
defaultConfig {
29-
compileSdk = 35
29+
compileSdk = libs.versions.compileSdk.get().toInt()
3030
applicationId = "com.google.maps.android.utils.demo"
3131
minSdk = 21
32-
targetSdk = 35
32+
targetSdk = libs.versions.targetSdk.get().toInt()
3333
versionCode = 1
3434
versionName = "1.0"
3535
}

gradle/libs.versions.toml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
[versions]
2-
appcompat = "1.7.0"
2+
compileSdk = "36"
3+
targetSdk = "36"
4+
appcompat = "1.7.1"
35
dokka-gradle-plugin = "2.0.0"
4-
gradle = "8.9.1"
6+
gradle = "8.12.0"
57
jacoco-android = "0.2.1"
68
lifecycle-extensions = "2.2.0"
7-
lifecycle-viewmodel-ktx = "2.9.0"
8-
kotlin = "2.1.20"
9+
lifecycle-viewmodel-ktx = "2.9.2"
10+
kotlin = "2.2.0"
911
kotlinx-coroutines = "1.10.2"
1012
junit = "4.13.2"
11-
mockito-core = "5.17.0"
13+
mockito-core = "5.18.0"
1214
secrets-gradle-plugin = "2.0.1"
1315
truth = "1.4.4"
1416
play-services-maps = "19.2.0"
1517
core-ktx = "1.16.0"
16-
robolectric = "4.14.1"
18+
robolectric = "4.15.1"
1719
kxml2 = "2.3.0"
18-
mockk = "1.14.2"
19-
lint = "31.10.0"
20+
mockk = "1.14.5"
21+
lint = "31.12.0"
2022
org-jacoco-core = "0.8.13"
2123
material = "1.12.0"
2224

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

library/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ android {
2424
sarifOutput = file("$buildDir/reports/lint-results.sarif")
2525
}
2626
defaultConfig {
27-
compileSdk = 35
27+
compileSdk = libs.versions.compileSdk.get().toInt()
2828
minSdk = 21
29-
targetSdk = 35
29+
targetSdk = libs.versions.targetSdk.get().toInt()
3030
consumerProguardFiles("consumer-rules.pro")
3131
buildConfigField("String", "TRAVIS", "\"${System.getenv("TRAVIS")}\"")
3232
}

0 commit comments

Comments
 (0)