diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 56953cfe..46127a44 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,14 +10,14 @@ androidTargetSdk = "37" agp = "9.2.1" dokka = "2.2.0" gradleMavenPublishPlugin = "0.36.0" -kotlin = "2.3.21" -kotlinxCoroutines = "1.10.2" +kotlin = "2.4.10" +kotlinxCoroutines = "1.11.0" # Android activitycompose = "1.13.0" -androidx-core = "1.18.0" +androidx-core = "1.19.0" androidx-startup = "1.2.0" -compose-bom = "2026.03.00" +compose-bom = "2026.06.01" constraintlayout = "2.2.1" # Material @@ -27,7 +27,7 @@ materialIconsExtendedAndroid = "1.7.8" # Google Maps Platform mapsecrets = "2.0.1" -mapsktx = "6.0.1" +mapsktx = "6.2.0" # Testing androidCore = "1.7.0" @@ -36,8 +36,8 @@ espresso = "3.7.0" junit = "4.13.2" junitktx = "1.3.0" leakcanaryAndroid = "2.14" -mockk = "1.14.9" -org-jacoco-core = "0.8.14" +mockk = "1.14.11" +org-jacoco-core = "0.8.15" jacoco-plugin = "0.2.1" robolectric = "4.16.1" screenshot = "0.0.1-alpha14" diff --git a/maps-app/build.gradle.kts b/maps-app/build.gradle.kts index f76710f4..da2a48e7 100644 --- a/maps-app/build.gradle.kts +++ b/maps-app/build.gradle.kts @@ -53,8 +53,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { @@ -77,7 +77,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) freeCompilerArgs.addAll( "-opt-in=kotlin.RequiresOptIn" ) diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt index 039aae58..98f722cf 100644 --- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt +++ b/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt @@ -383,20 +383,8 @@ private enum class ClusteringType { } data class MyItem( - val itemPosition: LatLng, - val itemTitle: String, - val itemSnippet: String, - val itemZIndex: Float, -) : ClusterItem { - override fun getPosition(): LatLng = - itemPosition - - override fun getTitle(): String = - itemTitle - - override fun getSnippet(): String = - itemSnippet - - override fun getZIndex(): Float = - itemZIndex -} + override val position: LatLng, + override val title: String, + override val snippet: String, + override val zIndex: Float, +) : ClusterItem diff --git a/maps-compose-utils/build.gradle.kts b/maps-compose-utils/build.gradle.kts index 456f97eb..0e3f83df 100644 --- a/maps-compose-utils/build.gradle.kts +++ b/maps-compose-utils/build.gradle.kts @@ -35,8 +35,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { @@ -54,7 +54,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) freeCompilerArgs.addAll( "-Xexplicit-api=strict", "-opt-in=kotlin.RequiresOptIn" diff --git a/maps-compose-widgets/build.gradle.kts b/maps-compose-widgets/build.gradle.kts index d4dc147c..c3812eb1 100644 --- a/maps-compose-widgets/build.gradle.kts +++ b/maps-compose-widgets/build.gradle.kts @@ -43,8 +43,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { @@ -62,7 +62,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) freeCompilerArgs.addAll( "-Xexplicit-api=strict", "-opt-in=kotlin.RequiresOptIn" diff --git a/maps-compose/build.gradle.kts b/maps-compose/build.gradle.kts index 754722fd..329f934b 100644 --- a/maps-compose/build.gradle.kts +++ b/maps-compose/build.gradle.kts @@ -35,8 +35,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { @@ -61,7 +61,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) freeCompilerArgs.addAll( "-Xexplicit-api=strict", "-opt-in=kotlin.RequiresOptIn"