expo-modules-core 1.3.2 → 1.5.0

package/CHANGELOG.md

@@ -10,6 +10,35 @@
 
 ### 💡 Others
 
+## 1.5.0 — 2023-06-21
+
+### 💡 Others
+
+- [iOS] Added Interface Geometry Management section to ExpoAppDelegate. ([#22599](https://github.com/expo/expo/pull/22599) by [@behenate](https://github.com/behenate))
+
+## 1.4.0 — 2023-06-13
+
+### 📚 3rd party library updates
+
+- Updated `robolectric` to `4.10` and `junit` to `4.13.2`. ([#22395](https://github.com/expo/expo/pull/22395) by [@josephyanks](https://github.com/josephyanks))
+
+### 🎉 New features
+
+- Added `ReactActivityHandler.getDelayLoadAppHandler` interface on Android. ([#20273](https://github.com/expo/expo/pull/20273) by [@kudo](https://github.com/kudo))
+- [iOS] Introduced shared refs – a way to pass native objects among different independent modules. ([#22583](https://github.com/expo/expo/pull/22583) by [@tsapeta](https://github.com/tsapeta))
+- Added support for React Native 0.72. ([#22588](https://github.com/expo/expo/pull/22588) by [@kudo](https://github.com/kudo))
+
+### 🐛 Bug fixes
+
+- Fix failing instrumentation tests in JavaScriptViewModule. ([#22518](https://github.com/expo/expo/pull/22518) by [@aleqsio](https://github.com/aleqsio))
+- Fixed Android build warnings for Gradle version 8. ([#22537](https://github.com/expo/expo/pull/22537), [#22609](https://github.com/expo/expo/pull/22609) by [@kudo](https://github.com/kudo))
+- [Android] Fix the `Color` converter doesn't work on devices with SDK version below 26. ([#22191](https://github.com/expo/expo/pull/22191) by [@lukmccall](https://github.com/lukmccall))
+- Refactored network inspector code and add unit tests. ([#22669](https://github.com/expo/expo/pull/22669), [#22693](https://github.com/expo/expo/pull/22693) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Updated `androidx.activity:activity-ktx` to `1.7.1` and `androidx.fragment:fragment-ktx` to `1.5.7` [#22658](https://github.com/expo/expo/pull/22658) by [@fobos531](https://github.com/fobos531)
+
 ## 1.3.2 — 2023-05-09
 
 ### 🐛 Bug fixes

package/ExpoModulesCore.podspec

@@ -12,7 +12,7 @@ if ENV["REACT_NATIVE_OVERRIDE_VERSION"]
   reactNativeVersion = ENV["REACT_NATIVE_OVERRIDE_VERSION"]
 end
 
-REACT_NATIVE_MINOR_VERSION = reactNativeVersion.split('.')[1].to_i
+reactNativeMinorVersion = reactNativeVersion.split('.')[1].to_i
 
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 fabric_compiler_flags = '-DRN_FABRIC_ENABLED -DRCT_NEW_ARCH_ENABLED'
@@ -59,16 +59,30 @@ Pod::Spec.new do |s|
     "FRAMEWORK_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/React-hermes\"",
     'OTHER_SWIFT_FLAGS' => "$(inherited) #{fabric_enabled ? fabric_compiler_flags : ''}"
   }
+  user_header_search_paths = [
+    '"${PODS_CONFIGURATION_BUILD_DIR}/ExpoModulesCore/Swift Compatibility Header"',
+    '"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging"',
+    '"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers"',
+  ]
+  if fabric_enabled && ENV['USE_FRAMEWORKS']
+    user_header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
+    user_header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers\""
+    user_header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\""
+    user_header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\""
+    user_header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\""
+    user_header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\""
+    user_header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\""
+  end
   s.user_target_xcconfig = {
-    "HEADER_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/ExpoModulesCore/Swift Compatibility Header\" \"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers\"",
+    "HEADER_SEARCH_PATHS" => user_header_search_paths,
   }
 
-  compiler_flags = folly_compiler_flags + ' ' + "-DREACT_NATIVE_MINOR_VERSION=#{REACT_NATIVE_MINOR_VERSION}"
+  compiler_flags = folly_compiler_flags + ' ' + "-DREACT_NATIVE_MINOR_VERSION=#{reactNativeMinorVersion}"
 
   s.dependency 'React-Core'
   s.dependency 'ReactCommon/turbomodule/core'
-  s.dependency 'React-RCTAppDelegate' if REACT_NATIVE_MINOR_VERSION >= 71
-  s.dependency 'React-NativeModulesApple' if REACT_NATIVE_MINOR_VERSION >= 72
+  s.dependency 'React-RCTAppDelegate' if reactNativeMinorVersion >= 71
+  s.dependency 'React-NativeModulesApple' if reactNativeMinorVersion >= 72
 
   if fabric_enabled
     compiler_flags << ' ' << fabric_compiler_flags
@@ -77,6 +91,13 @@ Pod::Spec.new do |s|
     s.dependency 'RCT-Folly', folly_version
   end
 
+  unless defined?(install_modules_dependencies)
+    # `install_modules_dependencies` is defined from react_native_pods.rb.
+    # when running with `pod ipc spec`, this method is not defined and we have to require manually.
+    require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
+  end
+  install_modules_dependencies(s)
+
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("ios/#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
     s.source_files = 'ios/**/*.h', 'common/cpp/**/*.h'
     s.vendored_frameworks = "ios/#{s.name}.xcframework"

package/android/CMakeLists.txt

@@ -78,7 +78,8 @@ endif ()
 
 if(${UNIT_TEST})
   if(${USE_HERMES})
-    set(JSEXECUTOR_LIB ReactAndroid::hermes_executor)
+    find_package(hermes-engine REQUIRED CONFIG)
+    set(JSEXECUTOR_LIB hermes-engine::libhermes)
   else()
     set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
   endif()

package/android/ExpoModulesCorePlugin.gradle

@@ -30,6 +30,10 @@ ext.applyKotlinExpoModulesCorePlugin = {
   apply plugin: KotlinExpoModulesCorePlugin
 }
 
+ext.boolish = { value ->
+  return value.toString().toBoolean()
+}
+
 // [BEGIN] Remove when we drop SDK 47
 abstract class ExtractReactNativeAARTask extends DefaultTask {
   @Input

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.3.2'
+version = '1.5.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -53,12 +53,12 @@ def customDownloadsDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
 def downloadsDir = customDownloadsDir ? new File(customDownloadsDir) : new File("$buildDir/downloads")
 def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
 
-def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":ReactAndroid") != null
+def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":packages:react-native:ReactAndroid") != null
 def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
-  ? findProject(":ReactAndroid").getProjectDir().parent
+  ? findProject(":packages:react-native:ReactAndroid").getProjectDir().parent
   : new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
 def REACT_NATIVE_SO_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
-  ? Paths.get(findProject(":ReactAndroid").getProjectDir().toString(), "build", "intermediates", "library_*", "*", "jni")
+  ? Paths.get(findProject(":packages:react-native:ReactAndroid").getProjectDir().toString(), "build", "intermediates", "library_*", "*", "jni")
   : "${buildDir}/react/jni"
 
 def reactProperties = new Properties()
@@ -79,26 +79,20 @@ def reactNativeArchitectures() {
 def prebuiltHermesDir = findProperty("expo.prebuiltHermesDir") ?: file("${rootDir}/prebuiltHermes")
 def prebuiltHermesVersion = file("${prebuiltHermesDir}/.hermesversion").exists() ? file("${prebuiltHermesDir}/.hermesversion").text : null
 def currentHermesVersion = file("${REACT_NATIVE_DIR}/sdks/.hermesversion").exists() ? file("${REACT_NATIVE_DIR}/sdks/.hermesversion").text : null
-def hasHermesProject = findProject(":ReactAndroid:hermes-engine") != null
+def hasHermesProject = findProject(":packages:react-native:ReactAndroid:hermes-engine") != null
 def prebuiltHermesCacheHit = hasHermesProject && currentHermesVersion == prebuiltHermesVersion
 
 // By default we are going to download and unzip hermes inside the /sdks/hermes folder
 // but you can provide an override for where the hermes source code is located.
 def hermesDir = System.getenv("REACT_NATIVE_OVERRIDE_HERMES_DIR") ?: file("${REACT_NATIVE_DIR}/sdks/hermes")
 
-def USE_HERMES = false
+def USE_HERMES = true
 def NEED_DOWNLOAD_HERMES = false
 def HERMES_HEADER_DIR = null
 def HERMES_AAR = null
 if (findProject(":app")) {
-  def appProjectExt = project(":app").ext
-  if (appProjectExt.has("react")) {
-    USE_HERMES = project(":app").ext.react.enableHermes
-  } else {
-    USE_HERMES = (findProperty('expo.jsEngine') ?: "jsc") == "hermes"
-  }
-} else {
-  USE_HERMES = (findProperty('expo.jsEngine') ?: "jsc") == "hermes"
+  def appProject = project(":app")
+  USE_HERMES = appProject?.hermesEnabled?.toBoolean() || appProject?.ext?.react?.enableHermes?.toBoolean()
 }
 
 // Currently the needs for hermes/jsc are only for androidTest, so we turn on this flag only when `isExpoModulesCoreTests` is true
@@ -126,19 +120,11 @@ if (USE_HERMES) {
 
 def isNewArchitectureEnabled = findProperty("newArchEnabled") == "true"
 
-// Creating sources with comments
-task androidSourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.srcDirs
-}
-
 afterEvaluate {
   publishing {
     publications {
       release(MavenPublication) {
         from components.release
-        // Add additional sourcesJar to artifacts
-        artifact(androidSourcesJar)
       }
     }
     repositories {
@@ -168,12 +154,13 @@ android {
     jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
+  namespace "expo.modules"
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.3.2"
+    versionName "1.5.0"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -263,6 +250,11 @@ android {
       }
     }
   }
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 
@@ -284,8 +276,8 @@ dependencies {
    * We're enforcing the most up-to-date versions of the dependencies here that are used in subclassing chain for ReactActivity.
    */
   implementation "androidx.appcompat:appcompat:1.4.1"
-  implementation "androidx.activity:activity-ktx:1.4.0" // androidx.appcompat:appcompat:1.4.1 depends on version 1.2.3, so we enforce higher one here
-  implementation "androidx.fragment:fragment-ktx:1.4.1" // androidx.appcomapt:appcompat:1.4.1 depends on version 1.3.4, so we enforce higher one here
+  implementation "androidx.activity:activity-ktx:1.7.1" // androidx.appcompat:appcompat:1.4.1 depends on version 1.2.3, so we enforce higher one here
+  implementation "androidx.fragment:fragment-ktx:1.5.7" // androidx.appcomapt:appcompat:1.4.1 depends on version 1.3.4, so we enforce higher one here
 
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
@@ -293,11 +285,12 @@ dependencies {
   compileOnly 'com.facebook.fbjni:fbjni:0.3.0'
 
   testImplementation 'androidx.test:core:1.4.0'
-  testImplementation 'junit:junit:4.13.1'
+  testImplementation 'junit:junit:4.13.2'
   testImplementation 'io.mockk:mockk:1.12.3'
   testImplementation "com.google.truth:truth:1.1.2"
-  testImplementation "org.robolectric:robolectric:4.5.1"
+  testImplementation "org.robolectric:robolectric:4.10"
   testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
+  testImplementation "org.json:json:20230227"
 
   androidTestImplementation 'androidx.test:runner:1.4.0'
   androidTestImplementation 'androidx.test:core:1.4.0'
@@ -307,10 +300,10 @@ dependencies {
   androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
 
   if (USE_HERMES) {
-    def hermesProject = findProject(":ReactAndroid:hermes-engine")
-    androidTestImplementation (hermesProject ?: files(HERMES_AAR))
+    def hermesProject = findProject(":packages:react-native:ReactAndroid:hermes-engine")
+    compileOnly (hermesProject ?: files(HERMES_AAR))
   } else {
-    androidTestImplementation "org.webkit:android-jsc:+"
+    compileOnly "org.webkit:android-jsc:+"
   }
 }
 
@@ -416,7 +409,7 @@ afterEvaluate {
   if (USE_HERMES) {
     nativeBuildDependsOn(project, prepareHermes, null)
     if (hasHermesProject && !prebuiltHermesCacheHit) {
-      prepareHermes.dependsOn(":ReactAndroid:hermes-engine:assembleDebug")
+      prepareHermes.dependsOn(":packages:react-native:ReactAndroid:hermes-engine:assembleDebug")
     }
   }
 }

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="expo.modules">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data

package/android/src/main/cpp/ExpoModulesHostObject.cpp

@@ -21,6 +21,9 @@ ExpoModulesHostObject::~ExpoModulesHostObject() {
   facebook::react::LongLivedObjectCollection::get().clear();
   installer->jsRegistry.reset();
   installer->runtimeHolder.reset();
+  installer->jsInvoker.reset();
+  installer->nativeInvoker.reset();
+  installer->jniDeallocator.reset();
 }
 
 jsi::Value ExpoModulesHostObject::get(jsi::Runtime &runtime, const jsi::PropNameID &name) {

package/android/src/main/cpp/JNIDeallocator.cpp

@@ -0,0 +1,17 @@
+// Copyright © 2021-present 650 Industries, Inc. (aka Expo)
+
+#include "JNIDeallocator.h"
+
+namespace expo {
+
+void JNIDeallocator::addReference(
+  jni::local_ref<Destructible::javaobject> jniObject
+) {
+  const static auto method = JNIDeallocator::javaClassLocal()
+    ->getMethod<void(jni::local_ref<Destructible>)>(
+      "addReference"
+    );
+  method(self(), std::move(jniObject));
+}
+
+} // namespace expo

package/android/src/main/cpp/JNIDeallocator.h

@@ -0,0 +1,25 @@
+// Copyright © 2021-present 650 Industries, Inc. (aka Expo)
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+
+namespace jni = facebook::jni;
+
+namespace expo {
+
+class Destructible : public jni::JavaClass<Destructible> {
+public:
+  static auto constexpr kJavaDescriptor = "Lexpo/modules/kotlin/jni/Destructible;";
+};
+
+class JNIDeallocator : public jni::JavaClass<JNIDeallocator> {
+public:
+  static auto constexpr kJavaDescriptor = "Lexpo/modules/kotlin/jni/JNIDeallocator;";
+
+  void addReference(
+    jni::local_ref<Destructible::javaobject> jniObject
+  );
+};
+
+} // namespace expo

package/android/src/main/cpp/JSIInteropModuleRegistry.cpp

@@ -37,9 +37,12 @@ JSIInteropModuleRegistry::JSIInteropModuleRegistry(jni::alias_ref<jhybridobject>
 
 void JSIInteropModuleRegistry::installJSI(
   jlong jsRuntimePointer,
+  jni::alias_ref<JNIDeallocator::javaobject> jniDeallocator,
   jni::alias_ref<react::CallInvokerHolder::javaobject> jsInvokerHolder,
   jni::alias_ref<react::CallInvokerHolder::javaobject> nativeInvokerHolder
 ) {
+  this->jniDeallocator = jni::make_global(jniDeallocator);
+
   auto runtime = reinterpret_cast<jsi::Runtime *>(jsRuntimePointer);
 
   jsRegistry = std::make_unique<JSReferencesCache>(*runtime);
@@ -73,10 +76,14 @@ void JSIInteropModuleRegistry::installJSI(
     );
 }
 
-void JSIInteropModuleRegistry::installJSIForTests() {
+void JSIInteropModuleRegistry::installJSIForTests(
+  jni::alias_ref<JNIDeallocator::javaobject> jniDeallocator
+) {
 #if !UNIT_TEST
   throw std::logic_error("The function is only available when UNIT_TEST is defined.");
 #else
+  this->jniDeallocator = jni::make_global(jniDeallocator);
+
   runtimeHolder = std::make_shared<JavaScriptRuntime>(this);
   jsi::Runtime &jsiRuntime = runtimeHolder->get();
 

package/android/src/main/cpp/JSIInteropModuleRegistry.h

@@ -8,6 +8,7 @@
 #include "JavaScriptObject.h"
 #include "JavaReferencesCache.h"
 #include "JSReferencesCache.h"
+#include "JNIDeallocator.h"
 
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
@@ -39,6 +40,7 @@ public:
    */
   void installJSI(
     jlong jsRuntimePointer,
+    jni::alias_ref<JNIDeallocator::javaobject> jniDeallocator,
     jni::alias_ref<react::CallInvokerHolder::javaobject> jsInvokerHolder,
     jni::alias_ref<react::CallInvokerHolder::javaobject> nativeInvokerHolder
   );
@@ -46,7 +48,9 @@ public:
   /**
    * Initializes the test runtime. Shouldn't be used in the production.
    */
-  void installJSIForTests();
+  void installJSIForTests(
+    jni::alias_ref<JNIDeallocator::javaobject> jniDeallocator
+  );
 
   /**
    * Gets a module for a given name. It will throw an exception if the module doesn't exist.
@@ -97,6 +101,7 @@ public:
   std::shared_ptr<react::CallInvoker> nativeInvoker;
   std::shared_ptr<JavaScriptRuntime> runtimeHolder;
   std::unique_ptr<JSReferencesCache> jsRegistry;
+  jni::global_ref<JNIDeallocator::javaobject> jniDeallocator;
 private:
   friend HybridBase;
   jni::global_ref<JSIInteropModuleRegistry::javaobject> javaPart_;

package/android/src/main/cpp/JavaCallback.cpp

@@ -1,6 +1,7 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
 #include "JavaCallback.h"
+#include "JSIInteropModuleRegistry.h"
 
 namespace expo {
 
@@ -21,6 +22,14 @@ void JavaCallback::registerNatives() {
                  });
 }
 
+jni::local_ref<JavaCallback::javaobject> JavaCallback::newInstance(
+  JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+  Callback callback
+) {
+  auto object = JavaCallback::newObjectCxxArgs(std::move(callback));
+  jsiInteropModuleRegistry->jniDeallocator->addReference(object);
+  return object;
+}
 
 void JavaCallback::invoke() {
   callback(nullptr);

package/android/src/main/cpp/JavaCallback.h

@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include "JNIDeallocator.h"
+
 #include <fbjni/fbjni.h>
 #include <folly/dynamic.h>
 
@@ -12,18 +14,26 @@ namespace jni = facebook::jni;
 namespace react = facebook::react;
 
 namespace expo {
-class JavaCallback : public jni::HybridClass<JavaCallback> {
+class JSIInteropModuleRegistry;
+
+class JavaCallback : public jni::HybridClass<JavaCallback, Destructible> {
 public:
   static auto constexpr
     kJavaDescriptor = "Lexpo/modules/kotlin/jni/JavaCallback;";
   static auto constexpr TAG = "JavaCallback";
 
+  using Callback = std::function<void(folly::dynamic)>;
+
   static void registerNatives();
 
+  static jni::local_ref<JavaCallback::javaobject> newInstance(
+    JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+    Callback callback
+  );
+
 private:
   friend HybridBase;
 
-  using Callback = std::function<void(folly::dynamic)>;
 
   JavaCallback(Callback callback);
 

package/android/src/main/cpp/JavaScriptFunction.cpp

@@ -53,4 +53,17 @@ jobject JavaScriptFunction::invoke(
   auto convertedResult = converter->convert(rt, env, moduleRegistry, result);
   return convertedResult;
 }
+
+jni::local_ref<JavaScriptFunction::javaobject> JavaScriptFunction::newInstance(
+  JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+  std::weak_ptr<JavaScriptRuntime> runtime,
+  std::shared_ptr<jsi::Function> jsFunction
+) {
+  auto function = JavaScriptFunction::newObjectCxxArgs(
+    std::move(runtime),
+    std::move(jsFunction)
+  );
+  jsiInteropModuleRegistry->jniDeallocator->addReference(function);
+  return function;
+}
 } // namespace expo

package/android/src/main/cpp/JavaScriptFunction.h

@@ -18,7 +18,7 @@ namespace expo {
 /**
  * Represents any JavaScript function. Its purpose is to expose the `jsi::Function` API back to Kotlin.
  */
-class JavaScriptFunction : public jni::HybridClass<JavaScriptFunction>, JSIFunctionWrapper {
+class JavaScriptFunction : public jni::HybridClass<JavaScriptFunction, Destructible>, JSIFunctionWrapper {
 public:
   static auto constexpr
     kJavaDescriptor = "Lexpo/modules/kotlin/jni/JavaScriptFunction;";
@@ -26,6 +26,12 @@ public:
 
   static void registerNatives();
 
+  static jni::local_ref<JavaScriptFunction::javaobject> newInstance(
+    JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+    std::weak_ptr<JavaScriptRuntime> runtime,
+    std::shared_ptr<jsi::Function> jsFunction
+  );
+
   JavaScriptFunction(
     std::weak_ptr<JavaScriptRuntime> runtime,
     std::shared_ptr<jsi::Function> jsFunction

package/android/src/main/cpp/JavaScriptModuleObject.cpp

@@ -199,7 +199,8 @@ std::shared_ptr<jsi::Object> JavaScriptModuleObject::getJSIObject(jsi::Runtime &
             JavaReferencesCache::instance()->getJClass(
               "expo/modules/kotlin/sharedobjects/SharedObject").clazz
           )) {
-            auto jsThisObject = JavaScriptObject::newObjectCxxArgs(
+            auto jsThisObject = JavaScriptObject::newInstance(
+              jsiInteropModuleRegistry,
               jsiInteropModuleRegistry->runtimeHolder,
               thisObject
             );

package/android/src/main/cpp/JavaScriptObject.cpp

@@ -7,6 +7,7 @@
 #include "JSITypeConverter.h"
 #include "ObjectDeallocator.h"
 #include "JavaReferencesCache.h"
+#include "JSIInteropModuleRegistry.h"
 
 namespace expo {
 void JavaScriptObject::registerNatives() {
@@ -73,7 +74,11 @@ jni::local_ref<JavaScriptValue::javaobject> JavaScriptObject::jniGetProperty(
   jni::alias_ref<jstring> name
 ) {
   auto result = std::make_shared<jsi::Value>(getProperty(name->toStdString()));
-  return JavaScriptValue::newObjectCxxArgs(runtimeHolder, result);
+  return JavaScriptValue::newInstance(
+    runtimeHolder.getModuleRegistry(),
+    runtimeHolder,
+    result
+  );
 }
 
 std::vector<std::string> JavaScriptObject::getPropertyNames() {
@@ -107,7 +112,7 @@ jni::local_ref<jni::JArrayClass<jstring>> JavaScriptObject::jniGetPropertyNames(
 jni::local_ref<JavaScriptFunction::javaobject> JavaScriptObject::jniAsFunction() {
   auto &jsRuntime = runtimeHolder.getJSRuntime();
   auto jsFuncion = std::make_shared<jsi::Function>(jsObject->asFunction(jsRuntime));
-  return JavaScriptFunction::newObjectCxxArgs(runtimeHolder, jsFuncion);
+  return JavaScriptFunction::newInstance(runtimeHolder.getModuleRegistry(), runtimeHolder, jsFuncion);
 }
 
 void JavaScriptObject::setProperty(const std::string &name, jsi::Value value) {
@@ -159,6 +164,16 @@ void JavaScriptObject::defineProperty(
   });
 }
 
+jni::local_ref<JavaScriptObject::javaobject> JavaScriptObject::newInstance(
+  JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+  std::weak_ptr<JavaScriptRuntime> runtime,
+  std::shared_ptr<jsi::Object> jsObject
+) {
+  auto object = JavaScriptObject::newObjectCxxArgs(std::move(runtime), std::move(jsObject));
+  jsiInteropModuleRegistry->jniDeallocator->addReference(object);
+  return object;
+}
+
 void JavaScriptObject::defineNativeDeallocator(
   jni::alias_ref<JNIFunctionBody::javaobject> deallocator
 ) {

package/android/src/main/cpp/JavaScriptObject.h

@@ -7,6 +7,7 @@
 #include "JavaScriptRuntime.h"
 #include "WeakRuntimeHolder.h"
 #include "JNIFunctionBody.h"
+#include "JNIDeallocator.h"
 
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
@@ -24,7 +25,7 @@ class JavaScriptFunction;
 /**
  * Represents any JavaScript object. Its purpose is to exposes `jsi::Object` API back to Kotlin.
  */
-class JavaScriptObject : public jni::HybridClass<JavaScriptObject>, JSIObjectWrapper {
+class JavaScriptObject : public jni::HybridClass<JavaScriptObject, Destructible>, JSIObjectWrapper {
 public:
   static auto constexpr
     kJavaDescriptor = "Lexpo/modules/kotlin/jni/JavaScriptObject;";
@@ -32,6 +33,12 @@ public:
 
   static void registerNatives();
 
+  static jni::local_ref<JavaScriptObject::javaobject> newInstance(
+    JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+    std::weak_ptr<JavaScriptRuntime> runtime,
+    std::shared_ptr<jsi::Object> jsObject
+  );
+
   JavaScriptObject(
     std::weak_ptr<JavaScriptRuntime> runtime,
     std::shared_ptr<jsi::Object> jsObject
@@ -84,13 +91,13 @@ private:
 
   bool jniHasProperty(jni::alias_ref<jstring> name);
 
-  jni::local_ref<jni::HybridClass<JavaScriptValue>::javaobject> jniGetProperty(
+  jni::local_ref<jni::HybridClass<JavaScriptValue, Destructible>::javaobject> jniGetProperty(
     jni::alias_ref<jstring> name
   );
 
   jni::local_ref<jni::JArrayClass<jstring>> jniGetPropertyNames();
 
-  jni::local_ref<jni::HybridClass<JavaScriptFunction>::javaobject> jniAsFunction();
+  jni::local_ref<jni::HybridClass<JavaScriptFunction, Destructible>::javaobject> jniAsFunction();
 
   /**
    * Unsets property with the given name.

package/android/src/main/cpp/JavaScriptRuntime.cpp

@@ -4,7 +4,7 @@
 #include "JavaScriptValue.h"
 #include "JavaScriptObject.h"
 #include "Exceptions.h"
-#include "JavaScriptRuntime.h"
+#include "JSIInteropModuleRegistry.h"
 
 #if UNIT_TEST
 
@@ -125,7 +125,8 @@ jni::local_ref<JavaScriptValue::javaobject>
 JavaScriptRuntime::evaluateScript(const std::string &script) {
   auto scriptBuffer = std::make_shared<jsi::StringBuffer>(script);
   try {
-    return JavaScriptValue::newObjectCxxArgs(
+    return JavaScriptValue::newInstance(
+      jsiInteropModuleRegistry,
       weak_from_this(),
       std::make_shared<jsi::Value>(runtime->evaluateJavaScript(scriptBuffer, "<<evaluated>>"))
     );
@@ -148,12 +149,12 @@ JavaScriptRuntime::evaluateScript(const std::string &script) {
 
 jni::local_ref<JavaScriptObject::javaobject> JavaScriptRuntime::global() {
   auto global = std::make_shared<jsi::Object>(runtime->global());
-  return JavaScriptObject::newObjectCxxArgs(weak_from_this(), global);
+  return JavaScriptObject::newInstance(jsiInteropModuleRegistry, weak_from_this(), global);
 }
 
 jni::local_ref<JavaScriptObject::javaobject> JavaScriptRuntime::createObject() {
   auto newObject = std::make_shared<jsi::Object>(*runtime);
-  return JavaScriptObject::newObjectCxxArgs(weak_from_this(), newObject);
+  return JavaScriptObject::newInstance(jsiInteropModuleRegistry, weak_from_this(), newObject);
 }
 
 void JavaScriptRuntime::drainJSEventLoop() {