react-native-nitro-modules 0.26.4 → 0.27.1

package/android/build.gradle

@@ -22,6 +22,7 @@ def isNewArchitectureEnabled() {
 
 apply plugin: "com.android.library"
 apply plugin: 'org.jetbrains.kotlin.android'
+apply from: "./fix-prefab.gradle"
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"

package/android/fix-prefab.gradle

@@ -0,0 +1,51 @@
+tasks.configureEach { task ->
+  // Make sure that we generate our prefab publication file only after having built the native library
+  // so that not a header publication file, but a full configuration publication will be generated, which
+  // will include the .so file
+
+  def prefabConfigurePattern = ~/^prefab(.+)ConfigurePackage$/
+  def matcher = task.name =~ prefabConfigurePattern
+  if (matcher.matches()) {
+    def variantName = matcher[0][1]
+    task.outputs.upToDateWhen { false }
+    task.dependsOn("externalNativeBuild${variantName}")
+  }
+}
+
+afterEvaluate {
+  def abis = reactNativeArchitectures()
+  rootProject.allprojects.each { proj ->
+    if (proj === rootProject) return
+
+    def dependsOnThisLib = proj.configurations.findAll { it.canBeResolved }.any { config ->
+      config.dependencies.any { dep ->
+        dep.group == project.group && dep.name == project.name
+      }
+    }
+    if (!dependsOnThisLib && proj != project) return
+
+    if (!proj.plugins.hasPlugin('com.android.application') && !proj.plugins.hasPlugin('com.android.library')) {
+      return
+    }
+
+    def variants = proj.android.hasProperty('applicationVariants') ? proj.android.applicationVariants : proj.android.libraryVariants
+    // Touch the prefab_config.json files to ensure that in ExternalNativeJsonGenerator.kt we will re-trigger the prefab CLI to
+    // generate a libnameConfig.cmake file that will contain our native library (.so).
+    // See this condition: https://cs.android.com/android-studio/platform/tools/base/+/mirror-goog-studio-main:build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ExternalNativeJsonGenerator.kt;l=207-219?q=createPrefabBuildSystemGlue
+    variants.all { variant ->
+      def variantName = variant.name
+      abis.each { abi ->
+        def searchDir = new File(proj.projectDir, ".cxx/${variantName}")
+        if (!searchDir.exists()) return
+        def matches = []
+        searchDir.eachDir { randomDir ->
+          def prefabFile = new File(randomDir, "${abi}/prefab_config.json")
+          if (prefabFile.exists()) matches << prefabFile
+        }
+        matches.each { prefabConfig ->
+          prefabConfig.setLastModified(System.currentTimeMillis())
+        }
+      }
+    }
+  }
+}

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

@@ -31,6 +31,21 @@ abstract class HybridObject {
     open val memorySize: Long
         get() = 0L
 
+    /**
+     * Eagerly- (and manually-) dispose all native resources this `HybridObject` holds.
+     * This method can only be manually called from JS using `dispose()`.
+     *
+     * If this method is never manually called, a `HybridObject` is expected to disposes it's
+     * resources as usual via the object's destructor (`~HybridObject()`, `deinit` or `finalize()`).
+     *
+     * By default, this method does nothing. It can be overridden to perform actual disposing/cleanup
+     * if required.
+     * This method must not throw.
+     */
+    @DoNotStrip
+    @Keep
+    open fun dispose() { }
+
     /**
      * Holds the native C++ instance.
      * In `HybridObject`, the C++ instance is a sub-class of `JHybridObject`, such as one of it's specs.

package/cpp/core/HybridObject.cpp

@@ -28,6 +28,8 @@ jsi::Value HybridObject::disposeRaw(jsi::Runtime& runtime, const jsi::Value& thi
   // 2. Remove the NativeState from `this`
   jsi::Object thisObject = thisArg.asObject(runtime);
   thisObject.setNativeState(runtime, nullptr);
+  // 3. Clear our object cache
+  _objectCache.clear();
 
   return jsi::Value::undefined();
 }

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.26.4"
+#define NITRO_VERSION "0.27.1"
 
 // Sets whether to use debug or optimized production build flags
 #ifdef DEBUG

package/ios/core/AnyMap.swift

@@ -45,7 +45,7 @@ public indirect enum AnyValue {
  * Represents an `AnyMap`- an untyped map instance.
  * See C++ `AnyMap.hpp` for more information.
  */
-public final class AnyMap {
+public final class AnyMap: @unchecked Sendable {
   public let cppPart: margelo.nitro.SharedAnyMap
 
   public init() {

package/ios/core/HybridObject.swift

@@ -27,9 +27,23 @@ public protocol HybridObject: AnyObject {
    * ```
    */
   var memorySize: Int { get }
+
+  /**
+   * Eagerly- (and manually-) dispose all native resources this `HybridObject` holds.
+   * This method can only be manually called from JS using `dispose()`.
+   *
+   * If this method is never manually called, a `HybridObject` is expected to disposes it's
+   * resources as usual via the object's destructor (`~HybridObject()`, `deinit` or `finalize()`).
+   *
+   * By default, this method does nothing. It can be overridden to perform actual disposing/cleanup
+   * if required.
+   */
+  func dispose()
 }
 
 public extension HybridObject {
   // By default, this returns `0`.
   var memorySize: Int { return 0 }
+  // By default, this does nothing.
+  func dispose() { }
 }

package/ios/core/Promise.swift

@@ -17,7 +17,7 @@ import Foundation
  * - `Promise<T>.rejected(withError:)` - Creates a new already rejected Promise.
  * - `Promise<T>()` - Creates a new Promise with fully manual control over the `resolve(..)`/`reject(..)` functions.
  */
-public final class Promise<T> {
+public final class Promise<T>: @unchecked Sendable {
   private enum State {
     case result(T)
     case error(Error)

package/ios/views/HybridView.swift

@@ -38,4 +38,11 @@ public extension HybridView {
   func afterUpdate() { /* noop */ }
 }
 
+public extension HybridView {
+  // In a View, this could be the size of the UIView.
+  var memorySize: Int {
+    return MemoryHelper.getSizeOf(self.view)
+  }
+}
+
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-modules",
-  "version": "0.26.4",
+  "version": "0.27.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",
@@ -14,6 +14,7 @@
     "lib",
     "android/build.gradle",
     "android/gradle.properties",
+    "android/fix-prefab.gradle",
     "android/CMakeLists.txt",
     "android/src/",
     "ios/",