@onekeyfe/react-native-cloud-kit-module 3.0.81 → 3.0.82

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

@@ -2,7 +2,7 @@
 /// JAccountInfoResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -22,7 +22,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   struct JAccountInfoResult final: public jni::JavaClass<JAccountInfoResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/AccountInfoResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/AccountInfoResult;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JDeleteRecordParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   struct JDeleteRecordParams final: public jni::JavaClass<JDeleteRecordParams> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/DeleteRecordParams;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/DeleteRecordParams;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JFetchRecordParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   struct JFetchRecordParams final: public jni::JavaClass<JFetchRecordParams> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/FetchRecordParams;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/FetchRecordParams;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JHybridCloudKitModuleSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridCloudKitModuleSpec.hpp"
@@ -40,6 +40,7 @@ namespace margelo::nitro::cloudkitmodule { struct QueryRecordsParams; }
 #include "JVariant_NullType_RecordResult.hpp"
 #include <NitroModules/JNull.hpp>
 #include "JRecordResult.hpp"
+#include <NitroModules/JUnit.hpp>
 #include "QueryRecordsResult.hpp"
 #include "JQueryRecordsResult.hpp"
 #include <vector>
@@ -56,30 +57,31 @@ namespace margelo::nitro::cloudkitmodule { struct QueryRecordsParams; }
 
 namespace margelo::nitro::cloudkitmodule {
 
-  jni::local_ref<JHybridCloudKitModuleSpec::jhybriddata> JHybridCloudKitModuleSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridCloudKitModuleSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridCloudKitModuleSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridCloudKitModuleSpec> JHybridCloudKitModuleSpec::JavaPart::getJHybridCloudKitModuleSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridCloudKitModuleSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridCloudKitModuleSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridCloudKitModuleSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridCloudKitModuleSpec::CxxPart::jhybriddata> JHybridCloudKitModuleSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  void JHybridCloudKitModuleSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+  std::shared_ptr<JHybridObject> JHybridCloudKitModuleSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridCloudKitModuleSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridCloudKitModuleSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridCloudKitModuleSpec>(castJavaPart);
   }
 
-  std::string JHybridCloudKitModuleSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridCloudKitModuleSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridCloudKitModuleSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -87,7 +89,7 @@ namespace margelo::nitro::cloudkitmodule {
 
   // Methods
   std::shared_ptr<Promise<bool>> JHybridCloudKitModuleSpec::isAvailable() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("isAvailable");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("isAvailable");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -103,7 +105,7 @@ namespace margelo::nitro::cloudkitmodule {
     }();
   }
   std::shared_ptr<Promise<AccountInfoResult>> JHybridCloudKitModuleSpec::getAccountInfo() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getAccountInfo");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("getAccountInfo");
     auto __result = method(_javaPart);
     return [&]() {
       auto __promise = Promise<AccountInfoResult>::create();
@@ -119,7 +121,7 @@ namespace margelo::nitro::cloudkitmodule {
     }();
   }
   std::shared_ptr<Promise<SaveRecordResult>> JHybridCloudKitModuleSpec::saveRecord(const SaveRecordParams& params) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JSaveRecordParams> /* params */)>("saveRecord");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JSaveRecordParams> /* params */)>("saveRecord");
     auto __result = method(_javaPart, JSaveRecordParams::fromCpp(params));
     return [&]() {
       auto __promise = Promise<SaveRecordResult>::create();
@@ -135,7 +137,7 @@ namespace margelo::nitro::cloudkitmodule {
     }();
   }
   std::shared_ptr<Promise<std::variant<nitro::NullType, RecordResult>>> JHybridCloudKitModuleSpec::fetchRecord(const FetchRecordParams& params) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JFetchRecordParams> /* params */)>("fetchRecord");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JFetchRecordParams> /* params */)>("fetchRecord");
     auto __result = method(_javaPart, JFetchRecordParams::fromCpp(params));
     return [&]() {
       auto __promise = Promise<std::variant<nitro::NullType, RecordResult>>::create();
@@ -151,7 +153,7 @@ namespace margelo::nitro::cloudkitmodule {
     }();
   }
   std::shared_ptr<Promise<void>> JHybridCloudKitModuleSpec::deleteRecord(const DeleteRecordParams& params) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JDeleteRecordParams> /* params */)>("deleteRecord");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JDeleteRecordParams> /* params */)>("deleteRecord");
     auto __result = method(_javaPart, JDeleteRecordParams::fromCpp(params));
     return [&]() {
       auto __promise = Promise<void>::create();
@@ -166,7 +168,7 @@ namespace margelo::nitro::cloudkitmodule {
     }();
   }
   std::shared_ptr<Promise<bool>> JHybridCloudKitModuleSpec::recordExists(const RecordExistsParams& params) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JRecordExistsParams> /* params */)>("recordExists");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JRecordExistsParams> /* params */)>("recordExists");
     auto __result = method(_javaPart, JRecordExistsParams::fromCpp(params));
     return [&]() {
       auto __promise = Promise<bool>::create();
@@ -182,7 +184,7 @@ namespace margelo::nitro::cloudkitmodule {
     }();
   }
   std::shared_ptr<Promise<QueryRecordsResult>> JHybridCloudKitModuleSpec::queryRecords(const QueryRecordsParams& params) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JQueryRecordsParams> /* params */)>("queryRecords");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>(jni::alias_ref<JQueryRecordsParams> /* params */)>("queryRecords");
     auto __result = method(_javaPart, JQueryRecordsParams::fromCpp(params));
     return [&]() {
       auto __promise = Promise<QueryRecordsResult>::create();

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

@@ -2,7 +2,7 @@
 /// HybridCloudKitModuleSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -18,33 +18,33 @@ namespace margelo::nitro::cloudkitmodule {
 
   using namespace facebook;
 
-  class JHybridCloudKitModuleSpec: public jni::HybridClass<JHybridCloudKitModuleSpec, JHybridObject>,
-                                   public virtual HybridCloudKitModuleSpec {
+  class JHybridCloudKitModuleSpec: public virtual HybridCloudKitModuleSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/HybridCloudKitModuleSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridCloudKitModuleSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridCloudKitModuleSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/HybridCloudKitModuleSpec;";
+      std::shared_ptr<JHybridCloudKitModuleSpec> getJHybridCloudKitModuleSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/HybridCloudKitModuleSpec$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 JHybridCloudKitModuleSpec(const jni::local_ref<JHybridCloudKitModuleSpec::JavaPart>& javaPart):
+      HybridObject(HybridCloudKitModuleSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridCloudKitModuleSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridCloudKitModuleSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridCloudKitModuleSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -63,9 +63,7 @@ namespace margelo::nitro::cloudkitmodule {
     std::shared_ptr<Promise<QueryRecordsResult>> queryRecords(const QueryRecordsParams& params) override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridCloudKitModuleSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridCloudKitModuleSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::cloudkitmodule

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

@@ -2,7 +2,7 @@
 /// JQueryRecordsParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   struct JQueryRecordsParams final: public jni::JavaClass<JQueryRecordsParams> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/QueryRecordsParams;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/QueryRecordsParams;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JQueryRecordsResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -24,7 +24,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   struct JQueryRecordsResult final: public jni::JavaClass<JQueryRecordsResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/QueryRecordsResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/QueryRecordsResult;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JRecordExistsParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   struct JRecordExistsParams final: public jni::JavaClass<JRecordExistsParams> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/RecordExistsParams;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/RecordExistsParams;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JRecordResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   struct JRecordResult final: public jni::JavaClass<JRecordResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/RecordResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/RecordResult;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JSaveRecordParams.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   struct JSaveRecordParams final: public jni::JavaClass<JSaveRecordParams> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/SaveRecordParams;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/SaveRecordParams;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JSaveRecordResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -21,7 +21,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   struct JSaveRecordResult final: public jni::JavaClass<JSaveRecordResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/SaveRecordResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/SaveRecordResult;";
 
   public:
     /**

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

@@ -2,7 +2,7 @@
 /// JVariant_NullType_RecordResult.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JVariant_NullType_RecordResult.hpp"

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

@@ -2,7 +2,7 @@
 /// JVariant_NullType_RecordResult.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -26,7 +26,7 @@ namespace margelo::nitro::cloudkitmodule {
    */
   class JVariant_NullType_RecordResult: public jni::JavaClass<JVariant_NullType_RecordResult> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/Variant_NullType_RecordResult;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/Variant_NullType_RecordResult;";
 
     static jni::local_ref<JVariant_NullType_RecordResult> create_0(jni::alias_ref<JNull> value) {
       static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_RecordResult(jni::alias_ref<JNull>)>("create");
@@ -49,9 +49,9 @@ namespace margelo::nitro::cloudkitmodule {
   };
 
   namespace JVariant_NullType_RecordResult_impl {
-    class First: public jni::JavaClass<First, JVariant_NullType_RecordResult> {
+    class First final: public jni::JavaClass<First, JVariant_NullType_RecordResult> {
     public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/Variant_NullType_RecordResult$First;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/Variant_NullType_RecordResult$First;";
     
       [[nodiscard]] jni::local_ref<JNull> getValue() const {
         static const auto field = javaClassStatic()->getField<JNull>("value");
@@ -59,9 +59,9 @@ namespace margelo::nitro::cloudkitmodule {
       }
     };
     
-    class Second: public jni::JavaClass<Second, JVariant_NullType_RecordResult> {
+    class Second final: public jni::JavaClass<Second, JVariant_NullType_RecordResult> {
     public:
-      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/Variant_NullType_RecordResult$Second;";
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/Variant_NullType_RecordResult$Second;";
     
       [[nodiscard]] jni::local_ref<JRecordResult> getValue() const {
         static const auto field = javaClassStatic()->getField<JRecordResult>("value");

package/nitrogen/generated/android/cloudkitmodule+autolinking.cmake

@@ -2,7 +2,7 @@
 # cloudkitmodule+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen

package/nitrogen/generated/android/cloudkitmodule+autolinking.gradle

@@ -2,7 +2,7 @@
 /// cloudkitmodule+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/nitrogen/generated/android/cloudkitmoduleOnLoad.cpp

@@ -2,7 +2,7 @@
 /// cloudkitmoduleOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_CLOUDKITMODULE_WITH_GENERATED_CMAKE_PROJECT
@@ -21,24 +21,34 @@
 namespace margelo::nitro::cloudkitmodule {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::cloudkitmodule::registerAllNatives();
+  });
+}
+
+struct JHybridCloudKitModuleSpecImpl: public jni::JavaClass<JHybridCloudKitModuleSpecImpl, JHybridCloudKitModuleSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/cloudkitmodule/CloudKitModule;";
+  static std::shared_ptr<JHybridCloudKitModuleSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridCloudKitModuleSpecImpl::javaobject()>();
+    jni::local_ref<JHybridCloudKitModuleSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridCloudKitModuleSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::cloudkitmodule;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::cloudkitmodule::JHybridCloudKitModuleSpec::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "CloudKitModule",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridCloudKitModuleSpec::javaobject> object("com/margelo/nitro/cloudkitmodule/CloudKitModule");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::cloudkitmodule::JHybridCloudKitModuleSpec::CxxPart::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "CloudKitModule",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridCloudKitModuleSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::cloudkitmodule

package/nitrogen/generated/android/cloudkitmoduleOnLoad.hpp

@@ -2,24 +2,33 @@
 /// cloudkitmoduleOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::cloudkitmodule {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of cloudkitmodule, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of cloudkitmodule, 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::cloudkitmodule::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all cloudkitmodule HybridObjects
+   *     margelo::nitro::cloudkitmodule::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::cloudkitmodule

package/nitrogen/generated/android/kotlin/com/margelo/nitro/cloudkitmodule/AccountInfoResult.kt

@@ -2,7 +2,7 @@
 /// AccountInfoResult.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.cloudkitmodule
@@ -29,7 +29,7 @@ data class AccountInfoResult(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/cloudkitmodule/DeleteRecordParams.kt

@@ -2,7 +2,7 @@
 /// DeleteRecordParams.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.cloudkitmodule
@@ -26,7 +26,7 @@ data class DeleteRecordParams(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */

package/nitrogen/generated/android/kotlin/com/margelo/nitro/cloudkitmodule/FetchRecordParams.kt

@@ -2,7 +2,7 @@
 /// FetchRecordParams.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 package com.margelo.nitro.cloudkitmodule
@@ -26,7 +26,7 @@ data class FetchRecordParams(
 ) {
   /* primary constructor */
 
-  private companion object {
+  companion object {
     /**
      * Constructor called from C++
      */