From 079eb25f643731a127b00c682a7ff7e9298f31af Mon Sep 17 00:00:00 2001 From: dkhawk <107309+dkhawk@users.noreply.github.com> Date: Mon, 18 May 2026 11:01:17 -0600 Subject: [PATCH 1/3] build(deps): update dependencies org.jetbrains.kotlin:kotlin-stdlib-jdk7 2.3.0 -> 2.3.21 org.jetbrains.kotlinx:kotlinx-coroutines-android 1.10.2 -> 1.11.0 com.google.maps.android:android-maps-utils 4.1.1 -> 4.3.0 --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fa0c879..ab34ca3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,15 +10,15 @@ androidxCoreKtx = "1.18.0" # Increasing androidxActivityKtx or lifecycleRuntimeKtx will require us to upgrade the minSdk androidxActivityKtx = "1.13.0" lifecycleRuntimeKtx = "2.10.0" -kotlin = "2.3.0" -kotlinxCoroutines = "1.10.2" +kotlin = "2.3.21" +kotlinxCoroutines = "1.11.0" material = "1.13.0" androidxStartup = "1.2.0" # --- Google Maps --- # Versions for Google Play Services libraries, which are essential for this sample. androidMapsSdk = "20.0.0" -androidMapsUtils = "4.1.1" +androidMapsUtils = "4.3.0" # --- Testing --- # Versions for testing libraries. From 71891da7df7cd2bfc454532961b753998da06bb5 Mon Sep 17 00:00:00 2001 From: dkhawk <107309+dkhawk@users.noreply.github.com> Date: Mon, 18 May 2026 11:49:00 -0600 Subject: [PATCH 2/3] build(deps): update dependency material com.google.android.material:material 1.13.0 -> 1.14.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ab34ca3..7a5d718 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ androidxActivityKtx = "1.13.0" lifecycleRuntimeKtx = "2.10.0" kotlin = "2.3.21" kotlinxCoroutines = "1.11.0" -material = "1.13.0" +material = "1.14.0" androidxStartup = "1.2.0" # --- Google Maps --- From 14db2f227fe82a536a887e9e10c3bd5f1d25be69 Mon Sep 17 00:00:00 2001 From: dkhawk <107309+dkhawk@users.noreply.github.com> Date: Tue, 19 May 2026 17:58:34 -0600 Subject: [PATCH 3/3] build: support conditional mavenLocal and upgrade JaCoCo --- .../src/main/kotlin/PublishingConventionPlugin.kt | 2 +- settings.gradle.kts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt index 2fdc51c..e1fd652 100644 --- a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt @@ -28,7 +28,7 @@ class PublishingConventionPlugin : Plugin { private fun Project.configureJacoco() { configure { - toolVersion = "0.8.7" + toolVersion = "0.8.12" } tasks.withType().configureEach { diff --git a/settings.gradle.kts b/settings.gradle.kts index e3a237f..8905c18 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,9 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { + if (System.getenv("USE_MAVEN_LOCAL") == "true") { + mavenLocal() + } google() mavenCentral() } @@ -8,6 +11,9 @@ dependencyResolutionManagement { pluginManagement { includeBuild("build-logic") repositories { + if (System.getenv("USE_MAVEN_LOCAL") == "true") { + mavenLocal() + } google() mavenCentral() gradlePluginPortal()