chore: update maps dependencies to 5.0.0-rc03 and compileSdk to 37

Author: dkhawk

FireMarkers/app/build.gradle.kts

@@ -121,6 +121,7 @@ dependencies {
     // ---------------------------------------------------------------------------------------------
     implementation(libs.dagger)
     ksp(libs.hilt.android.compiler)
+    ksp("org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0")
     implementation(libs.hilt.android)
 
     // ---------------------------------------------------------------------------------------------

gradle.properties

@@ -18,3 +18,4 @@ org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 # org.gradle.parallel=true
 android.enableJetifier=true
 android.useAndroidX=true
+android.suppressUnsupportedCompileSdk=37,37.0

gradle/libs.versions.toml

@@ -2,14 +2,14 @@
 # Project Configuration
 androidGradlePlugin = "8.13.2"
 minSdk = "24"
-compileSdk = "36"
-targetSdk = "36"
+compileSdk = "37"
+targetSdk = "37"
 versionCode = "1"
 versionName = "2.0.2" # {x-release-please-version}
 javaVersion = "17"
 
 # Kotlin & Coroutines
-kotlin = "2.2.0"
+kotlin = "2.3.10"
 kotlinxCoroutinesTest = "1.10.2"
 kotlinxDatetime = "0.7.1"
 ksp = "2.2.20-2.0.4"
@@ -36,8 +36,9 @@ material3 = "1.4.0"
 materialIconsExtended = "1.7.8"
 
 # Google Maps & Places
-mapsCompose = "7.0.0"
-mapsKtx = "6.0.0"
+androidMapsUtils = "5.0.0-rc03"
+mapsCompose = "8.3.1-rc03"
+mapsKtx = "6.1.0-rc03"
 places = "5.1.1"
 playServicesMaps = "20.0.0"
 secretsGradlePlugin = "2.0.1"
@@ -47,8 +48,8 @@ wear = "1.3.0"
 wearable = "2.9.0"
 
 # Dependency Injection
-dagger = "2.57.2"
-hilt = "2.57.2"
+dagger = "2.57.1"
+hilt = "2.57.1"
 
 # Testing
 espresso = "3.7.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -28,6 +28,7 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {
+        mavenLocal()
         google()
         mavenCentral()
     }

snippets/app-utils-ktx/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 
 android {
     namespace = "com.example.app_utils_ktx"
-    compileSdk = 36
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.example.app_utils_ktx"

snippets/app-utils-ktx/src/main/java/com/example/app_utils_ktx/Clustering.kt

@@ -29,35 +29,11 @@ internal class Clustering {
     inner class MyItem(
         lat: Double,
         lng: Double,
-        title: String,
-        snippet: String
+        override val title: String,
+        override val snippet: String
     ) : ClusterItem {
-
-        private val position: LatLng
-        private val title: String
-        private val snippet: String
-
-        override fun getPosition(): LatLng {
-            return position
-        }
-
-        override fun getTitle(): String {
-            return title
-        }
-
-        override fun getSnippet(): String {
-            return snippet
-        }
-
-        override fun getZIndex(): Float {
-            return 0f
-        }
-
-        init {
-            position = LatLng(lat, lng)
-            this.title = title
-            this.snippet = snippet
-        }
+        override val position: LatLng = LatLng(lat, lng)
+        override val zIndex: Float? = 0f
     }
     // [END maps_android_utils_clustering_cluster_item]
 

snippets/app-utils-ktx/src/main/java/com/example/app_utils_ktx/GeoJSON.kt

@@ -35,7 +35,7 @@ internal class GeoJSON {
             // [START_EXCLUDE silent]
             null
             // [END_EXCLUDE]
-        val layer = GeoJsonLayer(map, geoJsonData)
+        val layer = GeoJsonLayer(map, geoJsonData!!)
         // [END maps_android_util_geojson_add_jsonobject]
     }
 
@@ -90,10 +90,10 @@ internal class GeoJSON {
         // [END maps_android_util_geojson_geometry_click_events]
 
         // [START maps_android_util_geojson_style]
-        val pointStyle = layer.defaultPointStyle
-        pointStyle.isDraggable = true
-        pointStyle.title = "Hello, World!"
-        pointStyle.snippet = "I am a draggable marker"
+        val pointStyle = layer.getDefaultPointStyle()
+        pointStyle.setDraggable(true)
+        pointStyle.setTitle("Hello, World!")
+        pointStyle.setSnippet("I am a draggable marker")
         // [END maps_android_util_geojson_style]
 
         // [START maps_android_util_geojson_style_specific]

snippets/app-utils-ktx/src/main/java/com/example/app_utils_ktx/KML.kt

@@ -42,7 +42,7 @@ internal class KML {
             // [START_EXCLUDE silent]
             null
             // [END_EXCLUDE]
-        val layer = KmlLayer(map, inputStream, context)
+        val layer = KmlLayer(map, inputStream!!, context)
         // [END maps_android_utils_kml_add_input_stream]
 
         // [START maps_android_utils_kml_add_layer]
@@ -54,21 +54,21 @@ internal class KML {
         // [END maps_android_utils_kml_remove_layer]
 
         // [START maps_android_utils_kml_access_containers]
-        for (containers in layer.containers) {
+        for (containers in layer.getContainers()) {
             // Do something to container
         }
         // [END maps_android_utils_kml_access_containers]
 
         // [START maps_android_utils_kml_access_placemarks]
-        for (placemark in layer.placemarks) {
+        for (placemark in layer.getPlacemarks()) {
             // Do something to Placemark
         }
         // [END maps_android_utils_kml_access_placemarks]
 
         // [START maps_android_utils_kml_access_properties]
-        for (container in layer.containers) {
+        for (container in layer.getContainers()) {
             if (container.hasProperty("name")) {
-                Log.i("KML", container.getProperty("name"))
+                Log.i("KML", container.getProperty("name") ?: "")
             }
         }
         // [END maps_android_utils_kml_access_properties]
@@ -78,7 +78,7 @@ internal class KML {
         layer.setOnFeatureClickListener { feature ->
             Log.i(
                 "KML",
-                "Feature clicked: " + feature.id
+                "Feature clicked: " + feature.getId()
             )
         }
         // [END maps_android_utils_kml_click_listener]
@@ -88,7 +88,7 @@ internal class KML {
     fun accessContainers(containers: Iterable<KmlContainer>) {
         for (container in containers) {
             if (container.hasContainers()) {
-                accessContainers(container.containers)
+                accessContainers(container.getContainers())
             }
         }
     } // [END maps_android_utils_kml_access_containers_nested]

snippets/app-utils-ktx/src/main/java/com/example/app_utils_ktx/Multilayer.kt

@@ -50,11 +50,11 @@ internal class Multilayer {
 
         // [START maps_android_utils_multilayer_manager]
         val clusterManager =
-            ClusterManager<MyItem>(context, map, markerManager)
+            ClusterManager<MyItem>(context!!, map, markerManager)
         val geoJsonLineLayer = GeoJsonLayer(
             map,
             R.raw.geojson_file,
-            context,
+            context!!,
             markerManager,
             polygonManager,
             polylineManager,
@@ -63,7 +63,7 @@ internal class Multilayer {
         val kmlPolylineLayer = KmlLayer(
             map,
             R.raw.kml_file,
-            context,
+            context!!,
             markerManager,
             polygonManager,
             polylineManager,
@@ -108,33 +108,10 @@ internal class Multilayer {
     inner class MyItem(
         lat: Double,
         lng: Double,
-        title: String,
-        snippet: String
-    ) :
-        ClusterItem {
-        private val position: LatLng
-        private val title: String
-        private val snippet: String
-        override fun getPosition(): LatLng {
-            return position
-        }
-
-        override fun getTitle(): String {
-            return title
-        }
-
-        override fun getSnippet(): String {
-            return snippet
-        }
-
-        override fun getZIndex(): Float {
-            return 0f
-        }
-
-        init {
-            position = LatLng(lat, lng)
-            this.title = title
-            this.snippet = snippet
-        }
+        override val title: String,
+        override val snippet: String
+    ) : ClusterItem {
+        override val position: LatLng = LatLng(lat, lng)
+        override val zIndex: Float? = 0f
     }
 }