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

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/RNGoogleMapsPlusView.kt

@@ -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/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)});
     }

package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusModuleSpec.cpp

@@ -26,37 +26,31 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNIOSPermissionResult; }
 
 namespace margelo::nitro::rngooglemapsplus {
 
-  jni::local_ref<JHybridRNGoogleMapsPlusModuleSpec::jhybriddata> JHybridRNGoogleMapsPlusModuleSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridRNGoogleMapsPlusModuleSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridRNGoogleMapsPlusModuleSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridRNGoogleMapsPlusModuleSpec> JHybridRNGoogleMapsPlusModuleSpec::JavaPart::getJHybridRNGoogleMapsPlusModuleSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridRNGoogleMapsPlusModuleSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridRNGoogleMapsPlusModuleSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridRNGoogleMapsPlusModuleSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridRNGoogleMapsPlusModuleSpec::CxxPart::jhybriddata> JHybridRNGoogleMapsPlusModuleSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridRNGoogleMapsPlusModuleSpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridRNGoogleMapsPlusModuleSpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridRNGoogleMapsPlusModuleSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridRNGoogleMapsPlusModuleSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridRNGoogleMapsPlusModuleSpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridRNGoogleMapsPlusModuleSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridRNGoogleMapsPlusModuleSpec>(castJavaPart);
   }
 
-  std::string JHybridRNGoogleMapsPlusModuleSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridRNGoogleMapsPlusModuleSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridRNGoogleMapsPlusModuleSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -64,15 +58,15 @@ namespace margelo::nitro::rngooglemapsplus {
 
   // Methods
   void JHybridRNGoogleMapsPlusModuleSpec::showLocationDialog() {
-    static const auto method = javaClassStatic()->getMethod<void()>("showLocationDialog");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("showLocationDialog");
     method(_javaPart);
   }
   void JHybridRNGoogleMapsPlusModuleSpec::openLocationSettings() {
-    static const auto method = javaClassStatic()->getMethod<void()>("openLocationSettings");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("openLocationSettings");
     method(_javaPart);
   }
   std::shared_ptr<Promise<RNLocationPermissionResult>> JHybridRNGoogleMapsPlusModuleSpec::requestLocationPermission() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("requestLocationPermission");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("requestLocationPermission");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<RNLocationPermissionResult>::create();
@@ -88,7 +82,7 @@ namespace margelo::nitro::rngooglemapsplus {
     }();
   }
   bool JHybridRNGoogleMapsPlusModuleSpec::isGooglePlayServicesAvailable() {
-    static const auto method = javaClassStatic()->getMethod<jboolean()>("isGooglePlayServicesAvailable");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean()>("isGooglePlayServicesAvailable");
     auto __result = method(_javaPart);
     return static_cast<bool>(__result);
   }

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

@@ -18,34 +18,33 @@ namespace margelo::nitro::rngooglemapsplus {
 
   using namespace facebook;
 
-  class JHybridRNGoogleMapsPlusModuleSpec: public jni::HybridClass<JHybridRNGoogleMapsPlusModuleSpec, JHybridObject>,
-                                           public virtual HybridRNGoogleMapsPlusModuleSpec {
+  class JHybridRNGoogleMapsPlusModuleSpec: public virtual HybridRNGoogleMapsPlusModuleSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridRNGoogleMapsPlusModuleSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridRNGoogleMapsPlusModuleSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec;";
+      std::shared_ptr<JHybridRNGoogleMapsPlusModuleSpec> getJHybridRNGoogleMapsPlusModuleSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridRNGoogleMapsPlusModuleSpec(const jni::local_ref<JHybridRNGoogleMapsPlusModuleSpec::JavaPart>& javaPart):
+      HybridObject(HybridRNGoogleMapsPlusModuleSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridRNGoogleMapsPlusModuleSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridRNGoogleMapsPlusModuleSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridRNGoogleMapsPlusModuleSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -61,9 +60,7 @@ namespace margelo::nitro::rngooglemapsplus {
     bool isGooglePlayServicesAvailable() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridRNGoogleMapsPlusModuleSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridRNGoogleMapsPlusModuleSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rngooglemapsplus