react-native-google-maps-plus 1.7.0-dev.14 → 1.7.0-dev.15

package/android/build.gradle

@@ -136,6 +136,6 @@ dependencies {
   implementation "com.google.android.gms:play-services-base:${getExtOrDefault('googlePlayServicesBaseVersion')}"
   implementation "com.google.android.gms:play-services-maps:${getExtOrDefault('googlePlayServicesMapsVersion')}"
   implementation "com.google.android.gms:play-services-location:${getExtOrDefault('googlePlayServicesLocationVersion')}"
-  implementation 'com.google.maps.android:android-maps-utils:3.10.0'
+  implementation "com.google.maps.android:android-maps-utils:${getExtOrDefault('mapsUtilsVersion')}"
   implementation 'com.caverock:androidsvg-aar:1.4'
 }

package/android/gradle.properties

@@ -3,6 +3,7 @@ RNGoogleMapsPlus_minSdkVersion=26
 RNGoogleMapsPlus_targetSdkVersion=36
 RNGoogleMapsPlus_compileSdkVersion=36
 RNGoogleMapsPlus_ndkVersion=27.1.12297006
-RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.8.0
+RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.9.0
 RNGoogleMapsPlus_googlePlayServicesMapsVersion=19.2.0
 RNGoogleMapsPlus_googlePlayServicesLocationVersion=21.3.0
+RNGoogleMapsPlus_mapsUtilsVersion=3.19.0

package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt

@@ -178,7 +178,7 @@ class MapMarkerBuilder(
     }
 
     if (!prev.markerStyleEquals(next)) {
-      buildIconAsync(marker.id, next) { icon ->
+      buildIconAsync(next) { icon ->
         marker.setIcon(icon)
         if (!prev.anchorEquals(next)) {
           marker.setAnchor(
@@ -242,11 +242,10 @@ class MapMarkerBuilder(
   }
 
   fun buildIconAsync(
-    id: String,
     m: RNMarker,
     onReady: (BitmapDescriptor?) -> Unit,
   ) {
-    jobsById[id]?.cancel()
+    jobsById[m.id]?.cancel()
 
     m.iconSvg ?: return onReady(null)
 
@@ -275,11 +274,11 @@ class MapMarkerBuilder(
           iconCache.evictAll()
         } catch (_: Throwable) {
         } finally {
-          jobsById.remove(id)
+          jobsById.remove(m.id)
         }
       }
 
-    jobsById[id] = job
+    jobsById[m.id] = job
   }
 
   fun cancelIconJob(id: String) {

package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt

@@ -151,7 +151,7 @@ class RNGoogleMapsPlusView(
         val prev = prevById[id]
         when {
           prev == null ->
-            markerBuilder.buildIconAsync(id, next) { icon ->
+            markerBuilder.buildIconAsync(next) { icon ->
               view.addMarker(
                 id,
                 markerBuilder.build(next, icon),

package/ios/MapMarkerBuilder.swift

@@ -142,11 +142,10 @@ final class MapMarkerBuilder {
 
   @MainActor
   func buildIconAsync(
-    _ id: String,
     _ m: RNMarker,
     onReady: @escaping (UIImage?) -> Void
   ) {
-    tasks[id]?.cancel()
+    tasks[m.id]?.cancel()
 
     if m.iconSvg == nil {
       onReady(nil)
@@ -161,7 +160,7 @@ final class MapMarkerBuilder {
 
     let task = Task(priority: .userInitiated) { [weak self] in
       guard let self else { return }
-      defer { self.tasks.removeValue(forKey: id) }
+      defer { self.tasks.removeValue(forKey: m.id) }
 
       let scale = UIScreen.main.scale
       let img = await self.renderUIImage(m, scale)
@@ -175,7 +174,7 @@ final class MapMarkerBuilder {
       }
     }
 
-    tasks[id] = task
+    tasks[m.id] = task
   }
 
   @MainActor

package/ios/RNGoogleMapsPlusView.swift

@@ -146,7 +146,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
               }
             }
           } else {
-            self.markerBuilder.buildIconAsync(next.id, next) { icon in
+            self.markerBuilder.buildIconAsync(next) { icon in
               let marker = self.markerBuilder.build(next, icon: icon)
               self.impl.addMarker(id: id, marker: marker)
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.7.0-dev.14",
+  "version": "1.7.0-dev.15",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",