diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts index 9556a50af..e2c64060b 100644 --- a/demo/build.gradle.kts +++ b/demo/build.gradle.kts @@ -26,10 +26,10 @@ android { } defaultConfig { - compileSdk = 35 + compileSdk = libs.versions.compileSdk.get().toInt() applicationId = "com.google.maps.android.utils.demo" minSdk = 21 - targetSdk = 35 + targetSdk = libs.versions.targetSdk.get().toInt() versionCode = 1 versionName = "1.0" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 862036287..61ddd0a0c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,12 @@ [versions] +compileSdk = "36" +targetSdk = "36" appcompat = "1.7.1" dokka-gradle-plugin = "2.0.0" gradle = "8.10.1" jacoco-android = "0.2.1" lifecycle-extensions = "2.2.0" -lifecycle-viewmodel-ktx = "2.9.1" +lifecycle-viewmodel-ktx = "2.9.2" kotlin = "2.2.0" kotlinx-coroutines = "1.10.2" junit = "4.13.2" @@ -15,8 +17,8 @@ play-services-maps = "19.2.0" core-ktx = "1.16.0" robolectric = "4.15.1" kxml2 = "2.3.0" -mockk = "1.14.4" -lint = "31.11.0" +mockk = "1.14.5" +lint = "31.12.0" org-jacoco-core = "0.8.13" material = "1.12.0" gradleMavenPublishPlugin = "0.34.0" @@ -49,4 +51,4 @@ lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "lint testutils = { module = "com.android.tools:testutils", version.ref = "lint" } org-jacoco-core = { module = "org.jacoco:org.jacoco.core", version.ref = "org-jacoco-core" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } -gradle-maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradleMavenPublishPlugin" } \ No newline at end of file +gradle-maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradleMavenPublishPlugin" } diff --git a/library/build.gradle.kts b/library/build.gradle.kts index 38f34bd7f..9b0aa5b2e 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -24,9 +24,9 @@ android { sarifOutput = file("$buildDir/reports/lint-results.sarif") } defaultConfig { - compileSdk = 35 + compileSdk = libs.versions.compileSdk.get().toInt() minSdk = 21 - targetSdk = 35 + targetSdk = libs.versions.targetSdk.get().toInt() consumerProguardFiles("consumer-rules.pro") buildConfigField("String", "TRAVIS", "\"${System.getenv("TRAVIS")}\"") }