chore: update dependencies (#377)

* chore: updating libraries

* chore: changed coroutines version

* chore: rename dependency, remove unnecessary dependencies

* chore: updated Java version

* chore: increased targetSdk

.github/workflows/docs.yml

@@ -34,10 +34,10 @@ jobs:
     - name: Gradle Wrapper Validation
       uses: gradle/wrapper-validation-action@v1.0.4
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2.3.1
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
 
     # Run dokka and create tar

.github/workflows/instrumentation-test.yml

@@ -35,10 +35,10 @@ jobs:
     - name: Gradle Wrapper Validation
       uses: gradle/wrapper-validation-action@v1.0.4
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2.3.1
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
 
     - name: Inject Maps API Key

.github/workflows/test.yml

@@ -37,10 +37,10 @@ jobs:
     - name: Gradle Wrapper Validation
       uses: gradle/wrapper-validation-action@v1.0.4
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
 
     - name: Build modules

app/build.gradle

@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace "com.google.maps.android.compose"
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -45,7 +45,6 @@ dependencies {
     implementation libs.kotlin
     implementation libs.material
     implementation libs.maps.ktx.std
-    implementation libs.maps.utils
     implementation libs.androidx.compose.ui.preview.tooling
     debugImplementation libs.androidx.compose.ui.tooling
 

app/src/main/java/com/google/maps/android/compose/MapClusteringActivity.kt

@@ -48,7 +48,7 @@ fun GoogleMapClustering() {
                 singapore2.latitude + Random.nextFloat(),
                 singapore2.longitude + Random.nextFloat(),
             )
-            items.add(MyItem(position, "Marker", "Snippet"))
+            items.add(MyItem(position, "Marker", "Snippet", 0f))
         }
     }
     GoogleMapClustering(items = items)
@@ -113,6 +113,7 @@ data class MyItem(
     val itemPosition: LatLng,
     val itemTitle: String,
     val itemSnippet: String,
+    val itemZIndex: Float,
 ) : ClusterItem {
     override fun getPosition(): LatLng =
         itemPosition
@@ -122,4 +123,7 @@ data class MyItem(
 
     override fun getSnippet(): String =
         itemSnippet
+
+    override fun getZIndex(): Float =
+        itemZIndex
 }

build.gradle

@@ -41,7 +41,7 @@ subprojects { project ->
     if (project.ext.artifactId == null) return
 
     apply plugin: 'com.android.library'
-    apply plugin: 'com.hiya.jacoco-android'
+    apply plugin: 'com.mxalbert.gradle.jacoco-android'
     apply plugin: 'maven-publish'
     apply plugin: 'org.jetbrains.dokka'
     apply plugin: 'signing'

gradle.properties

@@ -28,4 +28,8 @@ signing.password=
 signing.secretKeyRingFile=
 
 sonatypeUsername=
-sonatypePassword=
+sonatypePassword=
+
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/libs.versions.toml

@@ -1,19 +1,19 @@
 [versions]
-activitycompose = "1.6.1"
-agp = "7.3.1"
+activitycompose = "1.7.2"
+agp = "8.1.1"
 androidxtest = "1.5.0"
-compose-bom = "2022.11.00"
-composecompiler = "1.3.2"
-coroutines = "1.6.0"
+compose-bom = "2023.09.01"
+composecompiler = "1.5.3"
+coroutines = "1.6.4"
 dokka = "1.9.0"
-espresso = "3.4.0"
-jacoco-plugin = "0.2"
+espresso = "3.5.1"
+jacoco-plugin = "0.2.1"
 jacoco-tool-plugin = "0.8.7"
-junitktx = "1.1.3"
+junitktx = "1.1.5"
 junit = "4.13.2"
-kotlin = "1.7.20"
-material = "1.5.0"
-maps = "3.4.0"
+kotlin = "1.9.10"
+material = "1.9.0"
+mapsktx = "4.0.0"
 mapsecrets = "2.0.1"
 
 [libraries]
@@ -25,7 +25,7 @@ androidx-compose-material = { module = "androidx.compose.material:material" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui" }
 androidx-compose-ui-preview-tooling = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
-androidx-core = { module = "androidx.core:core-ktx", version.require = "1.7.0" }
+androidx-core = { module = "androidx.core:core-ktx", version.require = "1.12.0" }
 androidx-test-compose-ui = { module = "androidx.compose.ui:ui-test-junit4" }
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidxtest" }
 androidx-test-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
@@ -34,16 +34,15 @@ androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxt
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxtest" }
 coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
-jacoco-android-plugin = { module = "com.hiya:jacoco-android", version.ref = "jacoco-plugin" }
+jacoco-android-plugin = { module = "com.mxalbert.gradle:jacoco-android", version.ref = "jacoco-plugin", version.require = "0.2.1" }
 kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-maps-ktx-std = { module = "com.google.maps.android:maps-ktx", version.ref = "maps" }
-maps-ktx-utils = { module = "com.google.maps.android:maps-utils-ktx", version.ref = "maps" }
-maps-utils = { module = "com.google.maps.android:android-maps-utils", version.require = "2.3.0" }
+maps-ktx-std = { module = "com.google.maps.android:maps-ktx", version.ref = "mapsktx" }
+maps-ktx-utils = { module = "com.google.maps.android:maps-utils-ktx", version.ref = "mapsktx" }
 maps-playservice = { module = "com.google.android.gms:play-services-maps", version.require = "18.1.0" }
 maps-secrets-plugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "mapsecrets" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 test-junit = { module = "junit:junit", version.ref = "junit" }
 
 [plugins]
-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
+dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Nov 17 17:56:49 EST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

maps-compose-utils/build.gradle

@@ -4,11 +4,11 @@ plugins {
 
 android {
     namespace "com.google.maps.android.compose.utils"
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }

maps-compose-widgets/build.gradle

@@ -4,11 +4,11 @@ plugins {
 
 android {
     namespace "com.google.maps.android.compose.widgets"
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }

maps-compose/build.gradle

@@ -4,11 +4,11 @@ plugins {
 
 android {
     namespace "com.google.maps.android.compose"
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }

maps-compose/src/main/java/com/google/maps/android/compose/MapApplier.kt

@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -110,7 +110,6 @@ internal class MapApplier(
                 nodeInputCallback = { onMarkerClick },
                 inputHandlerCallback = { onMarkerClick }
             )
-                ?: false
         }
         map.setOnInfoWindowClickListener { marker ->
             decorations.findInputCallback<MarkerNode, Marker, Unit>(