Skip to content

Commit 54d87c8

Browse files
committed
fix(deps): update maps-ktx to 6.3.0 and project dependencies
- Update maps-ktx and maps-utils-ktx to 6.3.0 - Add mavenLocal() repository to dependencyResolutionManagement - Update AGP to 9.3.1 and Gradle wrapper to 9.6.1 - Update com.vanniktech.maven.publish to 0.37.0 - Update constraintlayout to 2.2.2 and material to 1.14.0 - Upgrade Java / Kotlin target versioning to Java 17 across all modules - Update JaCoCo configuration and paths in PublishingConventionPlugin
1 parent 1d971cd commit 54d87c8

8 files changed

Lines changed: 34 additions & 22 deletions

File tree

build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class PublishingConventionPlugin : Plugin<Project> {
4444

4545
private fun Project.configureJacoco() {
4646
configure<JacocoPluginExtension> {
47-
toolVersion = "0.8.11" // Compatible with newer JDKs
47+
toolVersion = "0.8.15" // Compatible with newer JDKs
4848
}
4949

5050
// AGP 9.0+ built-in Jacoco support or manual configuration.
@@ -63,9 +63,17 @@ class PublishingConventionPlugin : Plugin<Project> {
6363
val mainSrc = "${layout.projectDirectory}/src/main/java"
6464
sourceDirectories.setFrom(files(mainSrc))
6565

66-
// Class directories - we need to point to where Kotlin compiles to
67-
val debugTree = fileTree("${layout.buildDirectory.get()}/tmp/kotlin-classes/debug")
68-
classDirectories.setFrom(files(debugTree))
66+
// Class directories - AGP 9's built-in Kotlin compiler outputs to
67+
// intermediates/built_in_kotlinc/, not the legacy tmp/kotlin-classes/ path.
68+
classDirectories.setFrom(
69+
fileTree(layout.buildDirectory.dir("intermediates/built_in_kotlinc/debug")) {
70+
include("**/classes/**")
71+
},
72+
fileTree(layout.buildDirectory.dir("intermediates/javac/debug")) {
73+
include("**/classes/**")
74+
exclude("**/R.class", "**/R\$*.class", "**/BuildConfig.class")
75+
}
76+
)
6977

7078
// Execution data from the unit test task
7179
executionData.setFrom(fileTree(layout.buildDirectory.get()) {

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ androidCompileSdk = "37"
77
androidMinSdk = "23"
88
androidTargetSdk = "37"
99

10-
agp = "9.2.1"
10+
agp = "9.3.1"
1111
dokka = "2.2.0"
12-
gradleMavenPublishPlugin = "0.36.0"
12+
gradleMavenPublishPlugin = "0.37.0"
1313
kotlin = "2.4.10"
1414
kotlinxCoroutines = "1.11.0"
1515

@@ -18,16 +18,16 @@ activitycompose = "1.13.0"
1818
androidx-core = "1.19.0"
1919
androidx-startup = "1.2.0"
2020
compose-bom = "2026.06.01"
21-
constraintlayout = "2.2.1"
21+
constraintlayout = "2.2.2"
2222

2323
# Material
24-
material = "1.13.0"
24+
material = "1.14.0"
2525
material3 = "1.4.0"
2626
materialIconsExtendedAndroid = "1.7.8"
2727

2828
# Google Maps Platform
2929
mapsecrets = "2.0.1"
30-
mapsktx = "6.2.0"
30+
mapsktx = "6.3.0"
3131

3232
# Testing
3333
androidCore = "1.7.0"

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-9.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

maps-app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ android {
5353
}
5454

5555
compileOptions {
56-
sourceCompatibility = JavaVersion.VERSION_11
57-
targetCompatibility = JavaVersion.VERSION_11
56+
sourceCompatibility = JavaVersion.VERSION_17
57+
targetCompatibility = JavaVersion.VERSION_17
5858
}
5959

6060
buildFeatures {
@@ -77,7 +77,7 @@ android {
7777

7878
kotlin {
7979
compilerOptions {
80-
jvmTarget.set(JvmTarget.JVM_11)
80+
jvmTarget.set(JvmTarget.JVM_17)
8181
freeCompilerArgs.addAll(
8282
"-opt-in=kotlin.RequiresOptIn"
8383
)

maps-compose-utils/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ android {
3535
}
3636

3737
compileOptions {
38-
sourceCompatibility = JavaVersion.VERSION_11
39-
targetCompatibility = JavaVersion.VERSION_11
38+
sourceCompatibility = JavaVersion.VERSION_17
39+
targetCompatibility = JavaVersion.VERSION_17
4040
}
4141

4242
buildFeatures {
@@ -54,7 +54,7 @@ android {
5454

5555
kotlin {
5656
compilerOptions {
57-
jvmTarget.set(JvmTarget.JVM_11)
57+
jvmTarget.set(JvmTarget.JVM_17)
5858
freeCompilerArgs.addAll(
5959
"-Xexplicit-api=strict",
6060
"-opt-in=kotlin.RequiresOptIn"

maps-compose-widgets/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ android {
4343
}
4444

4545
compileOptions {
46-
sourceCompatibility = JavaVersion.VERSION_11
47-
targetCompatibility = JavaVersion.VERSION_11
46+
sourceCompatibility = JavaVersion.VERSION_17
47+
targetCompatibility = JavaVersion.VERSION_17
4848
}
4949

5050
buildFeatures {
@@ -62,7 +62,7 @@ android {
6262

6363
kotlin {
6464
compilerOptions {
65-
jvmTarget.set(JvmTarget.JVM_11)
65+
jvmTarget.set(JvmTarget.JVM_17)
6666
freeCompilerArgs.addAll(
6767
"-Xexplicit-api=strict",
6868
"-opt-in=kotlin.RequiresOptIn"

maps-compose/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ android {
3535
}
3636

3737
compileOptions {
38-
sourceCompatibility = JavaVersion.VERSION_11
39-
targetCompatibility = JavaVersion.VERSION_11
38+
sourceCompatibility = JavaVersion.VERSION_17
39+
targetCompatibility = JavaVersion.VERSION_17
4040
}
4141

4242
buildFeatures {
@@ -61,7 +61,7 @@ android {
6161

6262
kotlin {
6363
compilerOptions {
64-
jvmTarget.set(JvmTarget.JVM_11)
64+
jvmTarget.set(JvmTarget.JVM_17)
6565
freeCompilerArgs.addAll(
6666
"-Xexplicit-api=strict",
6767
"-opt-in=kotlin.RequiresOptIn"

settings.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
dependencyResolutionManagement {
1818
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1919
repositories {
20+
if (providers.gradleProperty("useMavenLocal").orNull == "true" ||
21+
providers.environmentVariable("USE_MAVEN_LOCAL").orNull == "true") {
22+
mavenLocal()
23+
}
2024
google()
2125
mavenCentral()
2226
}

0 commit comments

Comments
 (0)