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

package/README.md

@@ -4,7 +4,7 @@
 [![Dev Release](https://img.shields.io/npm/v/react-native-google-maps-plus/dev.svg?label=dev%20release&color=orange)](https://www.npmjs.com/package/react-native-google-maps-plus)
 [![Build](https://github.com/pinpong/react-native-google-maps-plus/actions/workflows/release.yml/badge.svg)](https://github.com/pinpong/react-native-google-maps-plus/actions/workflows/release.yml)
 [![API Docs](https://img.shields.io/static/v1?label=typedoc&message=docs&color=informational)](https://pinpong.github.io/react-native-google-maps-plus)
-![React Native](https://img.shields.io/badge/react--native-%3E%3D0.81.0-61dafb.svg?logo=react)
+![React Native](https://img.shields.io/badge/react--native-%3E%3D0.82.0-61dafb.svg?logo=react)
 
 React Native wrapper for Android & iOS Google Maps SDK.
 

package/RNGoogleMapsPlus.podspec

@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
 
-  s.dependency 'GoogleMaps', '10.8.0'
+  s.dependency 'GoogleMaps', '10.10.0'
   s.dependency 'Google-Maps-iOS-Utils', '7.0.0'
   s.dependency 'SVGKit', '3.0.0'
 

package/android/src/main/cpp/cpp-adapter.cpp

@@ -1,6 +1,9 @@
+#include <fbjni/fbjni.h>
 #include <jni.h>
 #include "RNGoogleMapsPlusOnLoad.hpp"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::rngooglemapsplus::initialize(vm);
+  return facebook::jni::initialize(vm, []() {
+    margelo::nitro::rngooglemapsplus::registerAllNatives();
+  });
 }

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()
 
@@ -41,9 +41,8 @@ class RNGoogleMapsPlusView(
   override val view =
     GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerBuilder, mapErrorHandler)
 
-  override fun dispose() {
+  override fun onDropView() {
     view.destroyInternal()
-    super.dispose()
   }
 
   override var initialProps: RNInitialProps? = null

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/ios/RNGoogleMapsPlusView.swift

@@ -34,7 +34,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
     )
   }
 
-  func dispose() {
+  func onDropView() {
     impl.deinitInternal()
   }
 

package/nitro.json

@@ -16,12 +16,24 @@
   ],
   "autolinking": {
     "RNGoogleMapsPlusView": {
-      "swift": "RNGoogleMapsPlusView",
-      "kotlin": "RNGoogleMapsPlusView"
+      "ios": {
+        "language": "swift",
+        "implementationClassName": "RNGoogleMapsPlusView"
+      },
+      "android": {
+        "language": "kotlin",
+        "implementationClassName": "RNGoogleMapsPlusView"
+      }
     },
     "RNGoogleMapsPlusModule": {
-      "swift": "RNGoogleMapsPlusModule",
-      "kotlin": "RNGoogleMapsPlusModule"
+      "ios": {
+        "language": "swift",
+        "implementationClassName": "RNGoogleMapsPlusModule"
+      },
+      "android": {
+        "language": "kotlin",
+        "implementationClassName": "RNGoogleMapsPlusModule"
+      }
     }
   },
   "ignorePaths": ["**/node_modules"]

package/nitrogen/generated/android/RNGoogleMapsPlusOnLoad.cpp

@@ -35,46 +35,62 @@
 namespace margelo::nitro::rngooglemapsplus {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::rngooglemapsplus::registerAllNatives();
+  });
+}
+
+struct JHybridRNGoogleMapsPlusViewSpecImpl: public jni::JavaClass<JHybridRNGoogleMapsPlusViewSpecImpl, JHybridRNGoogleMapsPlusViewSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/RNGoogleMapsPlusView;";
+  static std::shared_ptr<JHybridRNGoogleMapsPlusViewSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridRNGoogleMapsPlusViewSpecImpl::javaobject()>();
+    jni::local_ref<JHybridRNGoogleMapsPlusViewSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridRNGoogleMapsPlusViewSpec();
+  }
+};
+struct JHybridRNGoogleMapsPlusModuleSpecImpl: public jni::JavaClass<JHybridRNGoogleMapsPlusModuleSpecImpl, JHybridRNGoogleMapsPlusModuleSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/RNGoogleMapsPlusModule;";
+  static std::shared_ptr<JHybridRNGoogleMapsPlusModuleSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridRNGoogleMapsPlusModuleSpecImpl::javaobject()>();
+    jni::local_ref<JHybridRNGoogleMapsPlusModuleSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridRNGoogleMapsPlusModuleSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::rngooglemapsplus;
-  using namespace facebook;
 
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::rngooglemapsplus::JHybridRNGoogleMapsPlusModuleSpec::registerNatives();
-    margelo::nitro::rngooglemapsplus::JHybridRNGoogleMapsPlusViewSpec::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_RNMapErrorCode_std__string_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_bool_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_RNRegion_RNCamera_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_RNLocation_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_RNLocationErrorCode_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_RNLatLng_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_std__string_std__string_RNLatLng_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_std__string_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_std__string_RNLatLng_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_RNIndoorBuilding_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_RNIndoorLevel_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::JFunc_void_RNRegion_RNCamera_bool_cxx::registerNatives();
-    margelo::nitro::rngooglemapsplus::views::JHybridRNGoogleMapsPlusViewStateUpdater::registerNatives();
+  // Register native JNI methods
+  margelo::nitro::rngooglemapsplus::JHybridRNGoogleMapsPlusModuleSpec::CxxPart::registerNatives();
+  margelo::nitro::rngooglemapsplus::JHybridRNGoogleMapsPlusViewSpec::CxxPart::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_RNMapErrorCode_std__string_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_bool_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_RNRegion_RNCamera_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_RNLocation_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_RNLocationErrorCode_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_RNLatLng_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_std__string_std__string_RNLatLng_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_std__string_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_std__string_RNLatLng_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_RNIndoorBuilding_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_RNIndoorLevel_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::JFunc_void_RNRegion_RNCamera_bool_cxx::registerNatives();
+  margelo::nitro::rngooglemapsplus::views::JHybridRNGoogleMapsPlusViewStateUpdater::registerNatives();
 
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "RNGoogleMapsPlusView",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridRNGoogleMapsPlusViewSpec::javaobject> object("com/rngooglemapsplus/RNGoogleMapsPlusView");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "RNGoogleMapsPlusModule",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridRNGoogleMapsPlusModuleSpec::javaobject> object("com/rngooglemapsplus/RNGoogleMapsPlusModule");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "RNGoogleMapsPlusView",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridRNGoogleMapsPlusViewSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "RNGoogleMapsPlusModule",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridRNGoogleMapsPlusModuleSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::rngooglemapsplus

package/nitrogen/generated/android/RNGoogleMapsPlusOnLoad.hpp

@@ -6,20 +6,29 @@
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::rngooglemapsplus {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of RNGoogleMapsPlus, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of RNGoogleMapsPlus, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
    * Example:
    * ```cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return margelo::nitro::rngooglemapsplus::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all RNGoogleMapsPlus HybridObjects
+   *     margelo::nitro::rngooglemapsplus::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::rngooglemapsplus

package/nitrogen/generated/android/c++/JFunc_void_RNIndoorBuilding.hpp

@@ -30,7 +30,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_RNIndoorBuilding: public jni::JavaClass<JFunc_void_RNIndoorBuilding> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNIndoorBuilding;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNIndoorBuilding;";
 
   public:
     /**
@@ -66,7 +66,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNIndoorBuilding_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNIndoorBuilding_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNIndoorBuilding_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_RNIndoorLevel.hpp

@@ -27,7 +27,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_RNIndoorLevel: public jni::JavaClass<JFunc_void_RNIndoorLevel> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNIndoorLevel;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNIndoorLevel;";
 
   public:
     /**
@@ -63,7 +63,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNIndoorLevel_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNIndoorLevel_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNIndoorLevel_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_RNLatLng.hpp

@@ -25,7 +25,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_RNLatLng: public jni::JavaClass<JFunc_void_RNLatLng> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLatLng;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLatLng;";
 
   public:
     /**
@@ -61,7 +61,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLatLng_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLatLng_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNLatLng_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_RNLocation.hpp

@@ -33,7 +33,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_RNLocation: public jni::JavaClass<JFunc_void_RNLocation> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLocation;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLocation;";
 
   public:
     /**
@@ -69,7 +69,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLocation_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLocation_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNLocation_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_RNLocationErrorCode.hpp

@@ -25,7 +25,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_RNLocationErrorCode: public jni::JavaClass<JFunc_void_RNLocationErrorCode> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLocationErrorCode;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLocationErrorCode;";
 
   public:
     /**
@@ -61,7 +61,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLocationErrorCode_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNLocationErrorCode_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNLocationErrorCode_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_RNMapErrorCode_std__string.hpp

@@ -26,7 +26,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_RNMapErrorCode_std__string: public jni::JavaClass<JFunc_void_RNMapErrorCode_std__string> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNMapErrorCode_std__string;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNMapErrorCode_std__string;";
 
   public:
     /**
@@ -62,7 +62,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNMapErrorCode_std__string_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNMapErrorCode_std__string_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNMapErrorCode_std__string_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera.hpp

@@ -31,7 +31,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_RNRegion_RNCamera: public jni::JavaClass<JFunc_void_RNRegion_RNCamera> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera;";
 
   public:
     /**
@@ -67,7 +67,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNRegion_RNCamera_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera_bool.hpp

@@ -31,7 +31,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_RNRegion_RNCamera_bool: public jni::JavaClass<JFunc_void_RNRegion_RNCamera_bool> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_bool;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_bool;";
 
   public:
     /**
@@ -67,7 +67,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_bool_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_RNRegion_RNCamera_bool_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_RNRegion_RNCamera_bool_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_bool.hpp

@@ -23,7 +23,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_bool: public jni::JavaClass<JFunc_void_bool> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_bool;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_bool;";
 
   public:
     /**
@@ -59,7 +59,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_bool_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_bool_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_bool_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp

@@ -24,7 +24,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_std__string: public jni::JavaClass<JFunc_void_std__string> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string;";
 
   public:
     /**
@@ -60,7 +60,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__string_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_std__string_RNLatLng.hpp

@@ -26,7 +26,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_std__string_RNLatLng: public jni::JavaClass<JFunc_void_std__string_RNLatLng> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_RNLatLng;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_RNLatLng;";
 
   public:
     /**
@@ -62,7 +62,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_RNLatLng_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_RNLatLng_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__string_RNLatLng_cxx::invoke_cxx)});
     }

package/nitrogen/generated/android/c++/JFunc_void_std__string_std__string_RNLatLng.hpp

@@ -26,7 +26,7 @@ namespace margelo::nitro::rngooglemapsplus {
    */
   struct JFunc_void_std__string_std__string_RNLatLng: public jni::JavaClass<JFunc_void_std__string_std__string_RNLatLng> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_std__string_RNLatLng;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_std__string_RNLatLng;";
 
   public:
     /**
@@ -62,7 +62,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_std__string_RNLatLng_cxx;";
+    static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/Func_void_std__string_std__string_RNLatLng_cxx;";
     static void registerNatives() {
       registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__string_std__string_RNLatLng_cxx::invoke_cxx)});
     }