react-native-nitro-modules 0.24.0 → 0.24.1

package/NitroModules.podspec

@@ -48,7 +48,6 @@ Pod::Spec.new do |s|
     # Public iOS-specific headers that will be exposed in modulemap (for Swift)
     "ios/core/ArrayBufferHolder.hpp",
     "ios/core/AnyMapHolder.hpp",
-    "ios/core/HybridContext.hpp",
     "ios/core/PromiseHolder.hpp",
     "ios/utils/Result.hpp",
     "ios/utils/RuntimeError.hpp",

package/android/src/main/cpp/JNIOnLoad.cpp

@@ -3,7 +3,6 @@
 #include "JAnyMap.hpp"
 #include "JAnyValue.hpp"
 #include "JArrayBuffer.hpp"
-#include "JHybridObjectRegistry.hpp"
 #include "JNitroModules.hpp"
 #include "JPromise.hpp"
 #include <fbjni/fbjni.h>
@@ -14,7 +13,6 @@ using namespace margelo::nitro;
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
   return facebook::jni::initialize(vm, [] {
     // 1. Initialize all core Nitro Java bindings
-    JHybridObjectRegistry::registerNatives();
     JArrayBuffer::registerNatives();
     JAnyMap::registerNatives();
     JAnyValue::registerNatives();

package/android/src/main/cpp/registry/JHybridObjectInitializer.hpp

@@ -18,7 +18,7 @@ using namespace facebook;
 struct JHybridObjectInitializer : public jni::JavaClass<JHybridObjectInitializer> {
 public:
   jni::local_ref<JHybridObject::javaobject> call() const {
-    const auto method = this->getClass()->getMethod<JHybridObject::javaobject()>("initialize");
+    const auto method = this->javaClassStatic()->getMethod<JHybridObject::javaobject()>("initialize");
     return method(self());
   }
 

package/android/src/main/java/com/margelo/nitro/core/ArrayBuffer.kt

@@ -137,10 +137,5 @@ class ArrayBuffer {
             byteBuffer.rewind()
             return ArrayBuffer(byteBuffer)
         }
-
-        @Deprecated("Use copy(...) instead", level = DeprecationLevel.WARNING)
-        fun copyOf(other: ArrayBuffer): ArrayBuffer {
-            return copy(other)
-        }
     }
 }

package/cpp/core/ArrayBuffer.hpp

@@ -67,11 +67,6 @@ public:
    * Create a new `NativeArrayBuffer` that allocates a new buffer of the given size.
    */
   static std::shared_ptr<ArrayBuffer> allocate(size_t size);
-
-  [[deprecated("Use wrapBuffer(...) instead.")]]
-  static std::shared_ptr<ArrayBuffer> makeBuffer(uint8_t* data, size_t size, DeleteFn&& deleteFunc) {
-    return ArrayBuffer::wrap(data, size, std::move(deleteFunc));
-  }
 };
 
 /**

package/cpp/core/Promise.hpp

@@ -161,10 +161,6 @@ public:
       _onResolvedListeners.push_back(onResolved);
     }
   }
-  [[deprecated("Upgrade Nitro to use PromiseHolder<T> instead.")]]
-  void addOnResolvedListenerCopy(const std::function<void(TResult)>& onResolved) {
-    addOnResolvedListener([=](const TResult& value) { onResolved(value); });
-  }
 
   /**
    * Add a listener that will be called when the Promise gets rejected.

package/cpp/jsi/JSIConverter.hpp

@@ -185,7 +185,6 @@ struct JSIConverter<std::string> final {
 #include "JSIConverter+ArrayBuffer.hpp"
 #include "JSIConverter+Exception.hpp"
 #include "JSIConverter+Function.hpp"
-#include "JSIConverter+Future.hpp"
 #include "JSIConverter+HostObject.hpp"
 #include "JSIConverter+HybridObject.hpp"
 #include "JSIConverter+Optional.hpp"

package/cpp/utils/NitroDefines.hpp

@@ -9,7 +9,7 @@
 #define NitroDefines_h
 
 // Sets the version of the native Nitro core library
-#define NITRO_VERSION "0.24.0"
+#define NITRO_VERSION "0.24.1"
 
 // Sets whether to use debug or optimized production build flags
 #ifdef DEBUG

package/ios/core/HybridObject.swift

@@ -33,13 +33,3 @@ public extension HybridObject {
   // By default, this returns `0`.
   var memorySize: Int { return 0 }
 }
-
-@available(*, deprecated, message: "HybridObjectSpec has been renamed to HybridObject. Update Nitrogen and re-generate your specs.")
-public typealias HybridObjectSpec = HybridObject
-
-public extension HybridObjectSpec {
-  @available(*, deprecated, message: "getSizeOf(...) will now be default-computed. Please remove getSizeOf() from your code.")
-  func getSizeOf<T: AnyObject>(_ instance: T) -> Int {
-    return 0
-  }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-modules",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "description": "Insanely fast native C++, Swift or Kotlin modules with a statically compiled binding layer to JSI.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/android/src/main/cpp/registry/JHybridObjectRegistry.cpp

@@ -1,45 +0,0 @@
-//
-//  JHybridObjectRegistry.cpp
-//  react-native-nitro
-//
-//  Created by Marc Rousavy on 22.07.24.
-//
-
-#include "JHybridObjectRegistry.hpp"
-#include "HybridObjectRegistry.hpp"
-#include "JNISharedPtr.hpp"
-#include "NitroDefines.hpp"
-
-namespace margelo::nitro {
-
-void JHybridObjectRegistry::registerHybridObjectConstructor(jni::alias_ref<jni::JClass>, std::string hybridObjectName,
-                                                            jni::alias_ref<JHybridObjectInitializer> constructorFn) {
-  auto sharedInitializer = jni::make_global(constructorFn);
-  HybridObjectRegistry::registerHybridObjectConstructor(
-      hybridObjectName,
-      [sharedInitializer = std::move(sharedInitializer),
-       hybridObjectName = std::move(hybridObjectName)]() -> std::shared_ptr<HybridObject> {
-        // 1. Call the Java initializer function
-        jni::local_ref<JHybridObject::javaobject> hybridObject = sharedInitializer->call();
-#ifdef NITRO_DEBUG
-        if (hybridObject == nullptr) [[unlikely]] {
-          throw std::runtime_error("Failed to create HybridObject \"" + hybridObjectName + "\" - the constructor returned null!");
-        }
-#endif
-
-        // 2. Make the resulting HybridObject a global (shared) reference
-        jni::global_ref<JHybridObject::javaobject> globalHybridObject = jni::make_global(hybridObject);
-        // 3. Create a shared_ptr from the JNI global reference
-        std::shared_ptr<JHybridObject> sharedCppPart = JNISharedPtr::make_shared_from_jni<JHybridObject>(globalHybridObject);
-        // 4. Up-cast to a HybridObject (kinda unsafe)
-        std::shared_ptr<HybridObject> cast = std::static_pointer_cast<HybridObject>(sharedCppPart);
-        return cast;
-      });
-}
-
-void JHybridObjectRegistry::registerNatives() {
-  javaClassStatic()->registerNatives({
-      makeNativeMethod("registerHybridObjectConstructor", JHybridObjectRegistry::registerHybridObjectConstructor),
-  });
-}
-} // namespace margelo::nitro

package/android/src/main/cpp/registry/JHybridObjectRegistry.hpp

@@ -1,32 +0,0 @@
-//
-//  JHybridObjectRegistry.hpp
-//  react-native-nitro
-//
-//  Created by Marc Rousavy on 22.07.24.
-//
-
-#pragma once
-
-#include "HybridObject.hpp"
-#include "JHybridObjectInitializer.hpp"
-#include <fbjni/fbjni.h>
-
-namespace margelo::nitro {
-
-using namespace facebook;
-
-struct JHybridObjectRegistry : public jni::JavaClass<JHybridObjectRegistry> {
-public:
-  static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/core/HybridObjectRegistry;";
-
-public:
-  [[deprecated("HybridObjects should be registered from C++ instead. Either autolink them using `nitro.json`, "
-               "or add them manually in the C++ HybridObjectRegistry.")]]
-  static void registerHybridObjectConstructor(jni::alias_ref<jni::JClass> clazz, std::string hybridObjectName,
-                                              jni::alias_ref<JHybridObjectInitializer> constructorFn);
-
-public:
-  static void registerNatives();
-};
-
-} // namespace margelo::nitro

package/android/src/main/java/com/margelo/nitro/core/HybridObjectInitializer.java

@@ -1,17 +0,0 @@
-package com.margelo.nitro.core;
-
-import androidx.annotation.Keep;
-
-import com.facebook.proguard.annotations.DoNotStrip;
-
-/**
- * @deprecated HybridObjects should be registered from C++ instead. Either autolink them using `nitro.json`, or add them manually in the C++ `HybridObjectRegistry`.
- */
-@Keep
-@DoNotStrip
-@Deprecated(forRemoval = true)
-public interface HybridObjectInitializer {
-    @Keep
-    @DoNotStrip
-    HybridObject initialize();
-}

package/android/src/main/java/com/margelo/nitro/core/HybridObjectRegistry.java

@@ -1,27 +0,0 @@
-package com.margelo.nitro.core;
-
-import androidx.annotation.Keep;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.margelo.nitro.JNIOnLoad;
-
-/**
- * A registry that holds initializers for HybridObjects.
- * This will be used to initialize them from JS using `NitroModules.createHybridObject<T>(name)`.
- * @noinspection JavaJniMissingFunction
- */
-@Keep
-@DoNotStrip
-public class HybridObjectRegistry {
-    static {
-        JNIOnLoad.initializeNativeNitro();
-    }
-
-    /**
-     * Registers the given HybridObject in the `HybridObjectRegistry`.
-     * It will be uniquely identified via it's `hybridObjectName`, and can be initialized from
-     * JS using `NitroModules.createHybridObject<T>(name)` - which will call the `constructorFn` here.
-     * @deprecated HybridObjects should be registered from C++ instead. Either autolink them using `nitro.json`, or add them manually in the C++ `HybridObjectRegistry`.
-     */
-    @Deprecated(forRemoval = true)
-    public static native void registerHybridObjectConstructor(String hybridObjectName, HybridObjectInitializer initializer);
-}

package/cpp/jsi/JSIConverter+Future.hpp

@@ -1,46 +0,0 @@
-//
-// Created by Marc Rousavy on 21.02.24.
-//
-
-#pragma once
-
-// Forward declare a few of the common types that might have cyclic includes.
-namespace margelo::nitro {
-
-template <typename T, typename Enable>
-struct JSIConverter;
-} // namespace margelo::nitro
-
-#include "JSIConverter.hpp"
-
-#include "Promise.hpp"
-#include <future>
-#include <jsi/jsi.h>
-#include <memory>
-
-namespace margelo::nitro {
-
-using namespace facebook;
-
-// std::future<T> <> Promise<T>
-template <typename TResult>
-struct JSIConverter<std::future<TResult>> final {
-  [[deprecated("Use JSIConverter<std::shared_ptr<Promise<T>>> instead.")]]
-  static inline std::future<TResult> fromJSI(jsi::Runtime& runtime, const jsi::Value& value) {
-    auto promise = JSIConverter<std::shared_ptr<Promise<TResult>>>::fromJSI(runtime, value);
-    return promise->await();
-  }
-
-  [[deprecated("Use JSIConverter<std::shared_ptr<Promise<T>>> instead.")]]
-  static inline jsi::Value toJSI(jsi::Runtime& runtime, std::future<TResult>&& arg) {
-    auto promise = Promise<TResult>::awaitFuture(std::move(arg));
-    return JSIConverter<std::shared_ptr<Promise<TResult>>>::toJSI(runtime, promise);
-  }
-
-  [[deprecated("Use JSIConverter<std::shared_ptr<Promise<T>>> instead.")]]
-  static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
-    return JSIConverter<std::shared_ptr<Promise<TResult>>>::canConvert(runtime, value);
-  }
-};
-
-} // namespace margelo::nitro

package/ios/core/HybridContext.hpp

@@ -1,55 +0,0 @@
-//
-//  HybridContext.hpp
-//  NitroModules
-//
-//  Created by Marc Rousavy on 17.07.24.
-//
-
-#pragma once
-
-namespace margelo::nitro {
-class HybridObject;
-}
-
-#include "HybridObject.hpp"
-#include "NitroLogger.hpp"
-#include "NitroTypeInfo.hpp"
-#include <memory>
-
-namespace margelo::nitro {
-
-/**
- * Represents contextual state for a `HybridObject`.
- *
- * This can be used in remote implementations, e.g. in a Swift implementation
- * to properly (weak-)reference the `HybridObject` instead of re-creating it each time.
- */
-struct [[deprecated("Update Nitrogen and re-generate your specs.")]]
-HybridContext final {
-public:
-  std::weak_ptr<HybridObject> cppPart;
-
-public:
-  template <typename THybridObject, typename TSwiftPart>
-  static inline std::shared_ptr<THybridObject> getOrCreate(TSwiftPart swiftPart) noexcept {
-    auto hybridContext = swiftPart.getHybridContext();
-    auto hybridObject = std::dynamic_pointer_cast<THybridObject>(hybridContext.cppPart.lock());
-    if (hybridObject != nullptr) [[likely]] {
-      // Fast path - an existing HybridObject is still in cache! (HybridContext)
-      return hybridObject;
-    }
-
-    // Slow path - we need to create a new HybridObject that wraps our Swift implementation.
-    Logger::log(LogLevel::Info, TAG, "Creating new HybridObject<%s> for %s...", TypeInfo::getFriendlyTypename<THybridObject>().c_str(),
-                TypeInfo::getFriendlyTypename<TSwiftPart>().c_str());
-    hybridObject = std::make_shared<THybridObject>(std::forward<decltype(swiftPart)>(swiftPart));
-    hybridContext.cppPart = hybridObject;
-    swiftPart.setHybridContext(hybridContext);
-    return hybridObject;
-  }
-
-private:
-  static constexpr auto TAG = "HybridContext";
-};
-
-} // namespace margelo::nitro