react-native-google-maps-plus 1.12.0-dev.5 → 1.12.0

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

@@ -57,11 +57,11 @@ import java.io.ByteArrayInputStream
 import java.nio.charset.StandardCharsets
 
 class GoogleMapsViewImpl(
-  val reactContext: ThemedReactContext,
-  val locationHandler: LocationHandler,
-  val playServiceHandler: PlayServicesHandler,
-  val markerBuilder: MapMarkerBuilder,
-  val mapErrorHandler: MapErrorHandler,
+  private val reactContext: ThemedReactContext,
+  private val locationHandler: LocationHandler,
+  private val playServiceHandler: PlayServicesHandler,
+  private val markerBuilder: MapMarkerBuilder,
+  private val mapErrorHandler: MapErrorHandler,
 ) : FrameLayout(reactContext),
   GoogleMap.OnCameraMoveStartedListener,
   GoogleMap.OnCameraMoveListener,
@@ -96,7 +96,7 @@ class GoogleMapsViewImpl(
   private val pendingCircles = mutableListOf<Pair<String, CircleOptions>>()
   private val pendingHeatmaps = mutableListOf<Pair<String, TileOverlayOptions>>()
   private val pendingKmlLayers = mutableListOf<Pair<String, String>>()
-  private val pendingUrlTilesOverlays = mutableListOf<Pair<String, TileOverlayOptions>>()
+  private val pendingUrlTileOverlays = mutableListOf<Pair<String, TileOverlayOptions>>()
 
   private val markersById = mutableMapOf<String, Marker>()
   private val polylinesById = mutableMapOf<String, Polyline>()
@@ -268,9 +268,9 @@ class GoogleMapsViewImpl(
       pendingKmlLayers.forEach { (id, str) -> addKmlLayerInternal(id, str) }
       pendingKmlLayers.clear()
     }
-    if (pendingUrlTilesOverlays.isNotEmpty()) {
-      pendingUrlTilesOverlays.forEach { (id, opts) -> addUrlTileOverlayInternal(id, opts) }
-      pendingUrlTilesOverlays.clear()
+    if (pendingUrlTileOverlays.isNotEmpty()) {
+      pendingUrlTileOverlays.forEach { (id, opts) -> addUrlTileOverlayInternal(id, opts) }
+      pendingUrlTileOverlays.clear()
     }
   }
 
@@ -775,7 +775,7 @@ class GoogleMapsViewImpl(
     opts: TileOverlayOptions,
   ) = onUi {
     if (googleMap == null) {
-      pendingUrlTilesOverlays.add(id to opts)
+      pendingUrlTileOverlays.add(id to opts)
       return@onUi
     }
     urlTileOverlaysById.remove(id)?.remove()
@@ -805,7 +805,7 @@ class GoogleMapsViewImpl(
         it.remove()
       }
       urlTileOverlaysById.clear()
-      pendingUrlTilesOverlays.clear()
+      pendingUrlTileOverlays.clear()
     }
 
   fun destroyInternal() =

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

@@ -27,7 +27,7 @@ private const val INTERVAL_DEFAULT = 600000L
 private const val MIN_UPDATE_INTERVAL = 3600000L
 
 class LocationHandler(
-  val context: ReactContext,
+  private val context: ReactContext,
 ) : LocationSource {
   private val fusedLocationClientProviderClient: FusedLocationProviderClient =
     LocationServices.getFusedLocationProviderClient(context)
@@ -68,7 +68,7 @@ class LocationHandler(
       val activity = context.currentActivity ?: run { return@onUi }
 
       val lr =
-        if (Build.VERSION.SDK_INT >= 31) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
           LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, 10_000L).build()
         } else {
           @Suppress("DEPRECATION")

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

@@ -42,7 +42,7 @@ import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.cancellation.CancellationException
 
 class MapMarkerBuilder(
-  val context: ThemedReactContext,
+  private val context: ThemedReactContext,
   private val mapErrorHandler: MapErrorHandler,
   private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default),
 ) {

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

@@ -5,7 +5,7 @@ import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 
 class PlayServicesHandler(
-  val context: ReactContext,
+  private val context: ReactContext,
 ) {
   fun playServicesAvailability(): Int {
     val availability = GoogleApiAvailability.getInstance()

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

@@ -22,7 +22,7 @@ import com.rngooglemapsplus.extensions.toSize
 
 @DoNotStrip
 class RNGoogleMapsPlusView(
-  val context: ThemedReactContext,
+  private val context: ThemedReactContext,
 ) : HybridRNGoogleMapsPlusViewSpec() {
   private val mapErrorHandler = MapErrorHandler()
 

package/ios/GoogleMapViewImpl.swift

@@ -322,7 +322,6 @@ GMSIndoorDisplayDelegate {
     }
   }
 
-  var onMapError: ((RNMapErrorCode) -> Void)?
   var onMapReady: ((Bool) -> Void)?
   var onMapLoaded: ((RNRegion, RNCamera) -> Void)?
   var onLocationUpdate: ((RNLocation) -> Void)?

package/nitrogen/generated/ios/c++/views/HybridRNGoogleMapsPlusViewComponent.mm

@@ -17,6 +17,13 @@
 #import "HybridRNGoogleMapsPlusViewSpecSwift.hpp"
 #import "RNGoogleMapsPlus-Swift-Cxx-Umbrella.hpp"
 
+#if __has_include(<cxxreact/ReactNativeVersion.h>)
+#include <cxxreact/ReactNativeVersion.h>
+#if REACT_NATIVE_VERSION_MINOR >= 82
+#define ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
+#endif
+#endif
+
 using namespace facebook;
 using namespace margelo::nitro::rngooglemapsplus;
 using namespace margelo::nitro::rngooglemapsplus::views;
@@ -324,10 +331,12 @@ using namespace margelo::nitro::rngooglemapsplus::views;
   swiftPart.maybePrepareForRecycle();
 }
 
+#ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
 - (void)invalidate {
   RNGoogleMapsPlus::HybridRNGoogleMapsPlusViewSpec_cxx& swiftPart = _hybridView->getSwiftPart();
   swiftPart.onDropView();
   [super invalidate];
 }
+#endif
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.12.0-dev.5",
+  "version": "1.12.0",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",
@@ -77,12 +77,12 @@
     "provenance": true
   },
   "devDependencies": {
-    "@commitlint/cli": "20.4.4",
-    "@commitlint/config-conventional": "20.4.4",
+    "@commitlint/cli": "20.5.0",
+    "@commitlint/config-conventional": "20.5.0",
     "@eslint/compat": "2.0.3",
     "@eslint/eslintrc": "3.3.5",
     "@eslint/js": "9.39.4",
-    "@expo/config-plugins": "55.0.6",
+    "@expo/config-plugins": "55.0.7",
     "@react-native/babel-preset": "0.84.1",
     "@react-native/eslint-config": "0.84.1",
     "@semantic-release/changelog": "6.0.3",
@@ -91,26 +91,26 @@
     "@semantic-release/npm": "13.1.5",
     "@types/jest": "30.0.0",
     "@types/react": "19.2.14",
-    "conventional-changelog-conventionalcommits": "9.3.0",
+    "conventional-changelog-conventionalcommits": "9.3.1",
     "del-cli": "7.0.0",
     "eslint": "9.39.4",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-typescript": "4.4.4",
     "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-jsdoc": "62.8.0",
+    "eslint-plugin-jsdoc": "62.9.0",
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-tsdoc": "0.5.2",
     "eslint-plugin-unused-imports": "4.4.1",
     "jest": "30.3.0",
     "lefthook": "2.1.4",
-    "nitrogen": "0.35.1",
+    "nitrogen": "0.35.2",
     "prettier": "3.8.1",
     "react": "19.2.3",
     "react-native": "0.84.1",
-    "react-native-builder-bob": "0.40.18",
-    "react-native-nitro-modules": "0.35.1",
+    "react-native-builder-bob": "0.41.0",
+    "react-native-nitro-modules": "0.35.2",
     "semantic-release": "25.0.3",
-    "typedoc": "0.28.17",
+    "typedoc": "0.28.18",
     "typescript": "5.9.3"
   },
   "peerDependencies": {