expo-modules-core 1.5.11 → 1.7.0

package/CHANGELOG.md

@@ -10,29 +10,47 @@
 
 ### 💡 Others
 
-## 1.5.11 — 2023-08-29
+## 1.7.0 — 2023-09-04
 
-### 🐛 Bug fixes
-
-- [Android] Fixed owner type of view functions. ([#24135](https://github.com/expo/expo/pull/24135) by [@lukmccall](https://github.com/lukmccall))
+### 🎉 New features
 
-## 1.5.10 — 2023-08-22
+- [Android] Surfaced errorManager to allow throwing errors and warnings from modules. ([#23848](https://github.com/expo/expo/pull/23848) by [@aleqsio](https://github.com/aleqsio))
+- [Android] Enums can now be used to define events. ([#23875](https://github.com/expo/expo/pull/23875) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Promises can now be resolved without arguments. ([#23907](https://github.com/expo/expo/pull/23907) by [@lukmccall](https://github.com/lukmccall))
+- Added support for React Native 0.73. ([#24018](https://github.com/expo/expo/pull/24018), [#24019](https://github.com/expo/expo/pull/24019) by [@kudo](https://github.com/kudo))
+- [Android] `Property` component can now take the native shared object instance as the first argument. ([#24206](https://github.com/expo/expo/pull/24206) by [@lukmccall](https://github.com/lukmccall))
 
 ### 🐛 Bug fixes
 
+- [Android] Refresh NativeModulesProxy if app bundle is reloaded. ([#23824](https://github.com/expo/expo/pull/23824) by [@douglowder](https://github.com/douglowder))
+- [Android] Fix nullability of parameter type in `List` and `Map` when converting from JS to native. ([#23942](https://github.com/expo/expo/pull/23942) by [@lukmccall](https://github.com/lukmccall))
 - Fixed Fabric setup error on iOS. ([#24004](https://github.com/expo/expo/pull/24004) by [@kudo](https://github.com/kudo))
+- Fixed uuid v4 generation. ([#24123](https://github.com/expo/expo/pull/24123) by [@tsapeta](https://github.com/tsapeta))
+- [Android] Fixed owner type of view functions. ([#24135](https://github.com/expo/expo/pull/24135) by [@lukmccall](https://github.com/lukmccall))
+
+### 💡 Others
 
-## 1.5.9 — 2023-07-29
+- [Android] Add type converter for the `ReadableArguments` class to allow backward compatibility with older modules. ([#24137](https://github.com/expo/expo/pull/24137) by [@lukmccall](https://github.com/lukmccall))
+- [Android] `SharedObjectTypeConverter` now can work with the `Dynamic` class. ([#24207](https://github.com/expo/expo/pull/24207) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Expose a conversion between id and shared objects. ([#24220](https://github.com/expo/expo/pull/24220) by [@lukmccall](https://github.com/lukmccall))
+
+## 1.6.0 — 2023-07-28
 
 ### 🐛 Bug fixes
 
+- [iOS] Fixed custom fonts support on Fabric. ([#23666](https://github.com/expo/expo/pull/23666) by [@aleqsio](https://github.com/aleqsio))
 - [Android] Fixed splash screen is missing when using the `getDelayLoadAppHandler()` from expo-updates. ([#23747](https://github.com/expo/expo/pull/23747) by [@kudo](https://github.com/kudo))
 
-## 1.5.8 — 2023-07-23
+### 💡 Others
+
+- Fork `uuid@3.4.0` and move into `expo-modules-core`. Remove the original dependency. ([#23249](https://github.com/expo/expo/pull/23249) by [@alanhughes](https://github.com/alanjhughes))
+- Improved error handling when working with native promises on Android. ([#23571](https://github.com/expo/expo/pull/23571) by [@lukmccall](https://github.com/lukmccall))
+- Added tracing to avoid slow app startup on Android. ([#23653](https://github.com/expo/expo/pull/23653) by [@lukmccall](https://github.com/lukmccall))
+
+## 1.5.8 - 2023-07-23
 
 ### 🐛 Bug fixes
 
-- Fork `uuid@3.4.0` and move into `expo-modules-core`. Remove the original dependency. ([#23249](https://github.com/expo/expo/pull/23249) by [@alanhughes](https://github.com/alanjhughes))
 - Fixed the `ErrorViewGroup` cannot be cast to module view class exception on Android. ([#23651](https://github.com/expo/expo/pull/23651) by [@lukmccall](https://github.com/lukmccall))
 - [iOS] Fix allowed orientations set in `Info.plist` being ignored when no delegates requested a different orientation. ([#23593](https://github.com/expo/expo/pull/23593) by [@behenate](https://github.com/behenate))
 

package/android/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_CXX_STANDARD 17)
 set(PACKAGE_NAME "expo-modules-core")
 set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
-set(ignoreMe "${PROJECT_BUILD_DIR} ${REACT_ANDROID_BUILD_DIR} ${REACT_ANDROID_DIR} ${HERMES_HEADER_DIR} ${BOOST_VERSION}")
+set(ignoreMe "${PROJECT_BUILD_DIR} ${REACT_ANDROID_BUILD_DIR} ${REACT_ANDROID_DIR} ${BOOST_VERSION}")
 
 string(APPEND CMAKE_CXX_FLAGS " -DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}")
 

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.5.11'
+version = '1.7.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -64,7 +64,8 @@ def REACT_NATIVE_SO_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
 def reactProperties = new Properties()
 file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 
-def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION")
+// TODO: Remove react-native < 0.71 support
+def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION") ?: "1_76_0"
 def REACT_NATIVE_VERSION = System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: reactProperties.getProperty("VERSION_NAME")
 def REACT_NATIVE_TARGET_VERSION = REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 
@@ -76,20 +77,7 @@ def reactNativeArchitectures() {
 }
 
 // HERMES
-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(":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 = true
-def NEED_DOWNLOAD_HERMES = false
-def HERMES_HEADER_DIR = null
-def HERMES_AAR = null
 if (findProject(":app")) {
   def appProject = project(":app")
   USE_HERMES = appProject?.hermesEnabled?.toBoolean() || appProject?.ext?.react?.enableHermes?.toBoolean()
@@ -97,25 +85,6 @@ if (findProject(":app")) {
 
 // Currently the needs for hermes/jsc are only for androidTest, so we turn on this flag only when `isExpoModulesCoreTests` is true
 USE_HERMES = USE_HERMES && isExpoModulesCoreTests
-
-if (USE_HERMES) {
-  if (prebuiltHermesCacheHit) {
-    HERMES_HEADER_DIR = file("${thirdPartyNdkDir}/hermes/prefab/modules/libhermes/include")
-    HERMES_AAR = file("${prebuiltHermesDir}/hermes-engine-debug.aar")
-  } else if (hasHermesProject) {
-    HERMES_HEADER_DIR = file("${thirdPartyNdkDir}/hermes/prefab/modules/libhermes/include")
-    HERMES_AAR = file("${REACT_NATIVE_DIR}/ReactAndroid/hermes-engine/build/outputs/aar/hermes-engine-debug.aar")
-  } else {
-    def prebuiltAAR = fileTree(REACT_NATIVE_DIR).matching { include "**/hermes-engine/**/hermes-engine-*-debug.aar" }
-    if (prebuiltAAR.any()) {
-      HERMES_AAR = prebuiltAAR.singleFile
-    } else {
-      HERMES_AAR = file("${hermesEngineDir}/android/hermes-debug.aar")
-    }
-    HERMES_HEADER_DIR = file("${hermesDir}")
-    NEED_DOWNLOAD_HERMES = true
-  }
-}
 // END HERMES
 
 def isNewArchitectureEnabled = findProperty("newArchEnabled") == "true"
@@ -145,13 +114,16 @@ android {
     ndkVersion rootProject.ext.ndkVersion
   }
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
-  }
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.majorVersion
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_11.majorVersion
+    }
   }
 
   namespace "expo.modules"
@@ -160,7 +132,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.5.11"
+    versionName "1.7.0"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -174,7 +146,6 @@ android {
           "-DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}",
           "-DBOOST_VERSION=${BOOST_VERSION}",
           "-DUSE_HERMES=${USE_HERMES}",
-          "-DHERMES_HEADER_DIR=${HERMES_HEADER_DIR}",
           "-DIS_NEW_ARCHITECTURE_ENABLED=${isNewArchitectureEnabled}",
           "-DPROJECT_BUILD_DIR=$buildDir",
           "-DREACT_ANDROID_DIR=${REACT_NATIVE_DIR}/ReactAndroid",
@@ -194,7 +165,20 @@ android {
     }
   }
 
+  sourceSets {
+    main {
+      java {
+        if (REACT_NATIVE_TARGET_VERSION >= 73) {
+          srcDirs += "src/reactnative"
+        } else {
+          srcDirs += "src/reactnative72"
+        }
+      }
+    }
+  }
+
   buildFeatures {
+    buildConfig true
     prefab true
   }
 
@@ -301,71 +285,20 @@ dependencies {
   androidTestImplementation "com.google.truth:truth:1.1.2"
   androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
 
-  if (USE_HERMES) {
-    def hermesProject = findProject(":packages:react-native:ReactAndroid:hermes-engine")
-    compileOnly (hermesProject ?: files(HERMES_AAR))
-  } else {
-    compileOnly "org.webkit:android-jsc:+"
+  if (isExpoModulesCoreTests) {
+    if (USE_HERMES) {
+      compileOnly "com.facebook.react:hermes-android"
+    } else {
+      compileOnly "org.webkit:android-jsc:+"
+    }
   }
 }
 
-/**
- * To make the users of annotations @OptIn and @RequiresOptIn aware of their experimental status,
- * the compiler raises warnings when compiling the code with these annotations:
- * This class can only be used with the compiler argument '-Xopt-in=kotlin.RequiresOptIn'
- * To remove the warnings, we add the compiler argument -Xopt-in=kotlin.RequiresOptIn.
- */
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-  kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
-}
-
 def createNativeDepsDirectories = project.tasks.findByName('createNativeDepsDirectories') ?: project.tasks.register('createNativeDepsDirectories') {
   downloadsDir.mkdirs()
   thirdPartyNdkDir.mkdirs()
 }
 
-// TODO: Remove all these hermes code when we update our repo to react-native 0.71 by using prefab
-task downloadHermes(type: Download) {
-  def hermesVersion = currentHermesVersion ?: "main"
-  src("https://github.com/facebook/hermes/tarball/${hermesVersion}")
-  onlyIfNewer(true)
-  overwrite(false)
-  dest(new File(downloadsDir, "hermes-${hermesVersion}.tar.gz"))
-}
-
-task unzipHermes(dependsOn: downloadHermes, type: Copy) {
-  from(tarTree(downloadHermes.dest)) {
-    eachFile { file ->
-      // We flatten the unzip as the tarball contains a `facebook-hermes-<SHA>`
-      // folder at the top level.
-      if (file.relativePath.segments.size() > 1) {
-        file.relativePath = new org.gradle.api.file.RelativePath(!file.isDirectory(), file.relativePath.segments.drop(1))
-      }
-    }
-  }
-  into(hermesDir)
-}
-
-task prepareHermes() {
-  if (!USE_HERMES) {
-    return
-  }
-  dependsOn(createNativeDepsDirectories)
-  if (NEED_DOWNLOAD_HERMES) {
-    dependsOn(unzipHermes)
-  }
-
-  doLast {
-    def files = zipTree(HERMES_AAR).matching({ it.include "**/*.so", "prefab/modules/libhermes/include/**/*" })
-
-    copy {
-      from files
-      from "$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/first-party/hermes/Android.mk"
-      into "$thirdPartyNdkDir/hermes"
-    }
-  }
-}
-
 def downloadBoost = tasks.create('downloadBoost', Download) {
   dependsOn(createNativeDepsDirectories)
   def srcUrl = REACT_NATIVE_TARGET_VERSION >= 69
@@ -408,12 +341,6 @@ afterEvaluate {
   if (REACT_NATIVE_TARGET_VERSION < 71) {
     nativeBuildDependsOn(project, prepareBoost, null)
   }
-  if (USE_HERMES) {
-    nativeBuildDependsOn(project, prepareHermes, null)
-    if (hasHermesProject && !prebuiltHermesCacheHit) {
-      prepareHermes.dependsOn(":packages:react-native:ReactAndroid:hermes-engine:assembleDebug")
-    }
-  }
 }
 
 if (REACT_NATIVE_TARGET_VERSION < 71) {

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

@@ -14,6 +14,23 @@ namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 
 namespace expo {
+
+namespace {
+
+#if REACT_NATIVE_TARGET_VERSION >= 73
+std::shared_ptr<NativeMethodCallInvokerCompatible> getNativeMethodCallInvokerHolderCompatible(
+  jni::alias_ref<NativeMethodCallInvokerHolderCompatible::javaobject> holder) {
+  return holder->cthis()->getNativeMethodCallInvoker();
+}
+#else
+std::shared_ptr<NativeMethodCallInvokerCompatible> getNativeMethodCallInvokerHolderCompatible(
+  jni::alias_ref<NativeMethodCallInvokerHolderCompatible::javaobject> holder) {
+  return holder->cthis()->getCallInvoker();
+}
+#endif
+
+} // namespace
+
 jni::local_ref<JSIInteropModuleRegistry::jhybriddata>
 JSIInteropModuleRegistry::initHybrid(jni::alias_ref<jhybridobject> jThis) {
   return makeCxxInstance(jThis);
@@ -39,7 +56,7 @@ 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
+  jni::alias_ref<NativeMethodCallInvokerHolderCompatible::javaobject> nativeInvokerHolder
 ) {
   this->jniDeallocator = jni::make_global(jniDeallocator);
 
@@ -51,7 +68,7 @@ void JSIInteropModuleRegistry::installJSI(
     this,
     runtime,
     jsInvokerHolder->cthis()->getCallInvoker(),
-    nativeInvokerHolder->cthis()->getCallInvoker()
+    getNativeMethodCallInvokerHolderCompatible(nativeInvokerHolder)
   );
 
   auto expoModules = std::make_shared<ExpoModulesHostObject>(this);
@@ -113,6 +130,16 @@ JSIInteropModuleRegistry::callGetJavaScriptModuleObjectMethod(const std::string
   return method(javaPart_, moduleName);
 }
 
+jni::local_ref<JavaScriptModuleObject::javaobject>
+JSIInteropModuleRegistry::callGetCoreModuleObject() const {
+  const static auto method = expo::JSIInteropModuleRegistry::javaClassLocal()
+    ->getMethod<jni::local_ref<JavaScriptModuleObject::javaobject>()>(
+      "getCoreModuleObject"
+    );
+
+  return method(javaPart_);
+}
+
 jni::local_ref<jni::JArrayClass<jni::JString>>
 JSIInteropModuleRegistry::callGetJavaScriptModulesNames() const {
   const static auto method = expo::JSIInteropModuleRegistry::javaClassLocal()
@@ -135,6 +162,10 @@ JSIInteropModuleRegistry::getModule(const std::string &moduleName) const {
   return callGetJavaScriptModuleObjectMethod(moduleName);
 }
 
+jni::local_ref<JavaScriptModuleObject::javaobject> JSIInteropModuleRegistry::getCoreModule() const {
+  return callGetCoreModuleObject();
+}
+
 bool JSIInteropModuleRegistry::hasModule(const std::string &moduleName) const {
   return callHasModule(moduleName);
 }

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

@@ -14,6 +14,9 @@
 #include <jsi/jsi.h>
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/CallInvoker.h>
+#if REACT_NATIVE_TARGET_VERSION >= 73
+#include <ReactCommon/NativeMethodCallInvokerHolder.h>
+#endif
 
 #include <memory>
 
@@ -22,6 +25,13 @@ namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 
 namespace expo {
+
+#if REACT_NATIVE_TARGET_VERSION >= 73
+using NativeMethodCallInvokerHolderCompatible = react::NativeMethodCallInvokerHolder;
+#else
+using NativeMethodCallInvokerHolderCompatible = react::CallInvokerHolder;
+#endif
+
 /**
  * A JNI wrapper to initialize CPP part of modules and access all data from the module registry.
  */
@@ -42,7 +52,7 @@ public:
     jlong jsRuntimePointer,
     jni::alias_ref<JNIDeallocator::javaobject> jniDeallocator,
     jni::alias_ref<react::CallInvokerHolder::javaobject> jsInvokerHolder,
-    jni::alias_ref<react::CallInvokerHolder::javaobject> nativeInvokerHolder
+    jni::alias_ref<NativeMethodCallInvokerHolderCompatible::javaobject> nativeInvokerHolder
   );
 
   /**
@@ -82,6 +92,11 @@ public:
    */
   jni::local_ref<JavaScriptObject::javaobject> createObject();
 
+  /**
+  * Gets a core module.
+  */
+  jni::local_ref<JavaScriptModuleObject::javaobject> getCoreModule() const;
+
   /**
    * Adds a shared object to the internal registry
    * @param native part of the shared object
@@ -113,6 +128,8 @@ private:
 
   inline jni::local_ref<jni::JArrayClass<jni::JString>> callGetJavaScriptModulesNames() const;
 
+  inline jni::local_ref<JavaScriptModuleObject::javaobject> callGetCoreModuleObject() const;
+
   inline bool callHasModule(const std::string &moduleName) const;
 };
 } // namespace expo

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

@@ -2,7 +2,7 @@
 
 #include "JavaScriptModuleObject.h"
 #include "JSIInteropModuleRegistry.h"
-#include "ObjectDeallocator.h"
+#include "JSIUtils.h"
 
 #include <folly/dynamic.h>
 #include <jsi/JSIDynamic.h>
@@ -61,7 +61,7 @@ void decorateObjectWithProperties(
       jsi::Value(runtime, *setter.toJSFunction(runtime,
                                                jsiInteropModuleRegistry))
     );
-    JavaScriptObject::defineProperty(runtime, jsObject, name, std::move(descriptor));
+    common::definePropertyOnJSIObject(runtime, jsObject, name.c_str(), std::move(descriptor));
   }
 }
 
@@ -215,8 +215,8 @@ std::shared_ptr<jsi::Object> JavaScriptModuleObject::getJSIObject(jsi::Runtime &
     auto descriptor = JavaScriptObject::preparePropertyDescriptor(runtime, 0);
     descriptor.setProperty(runtime, "value", jsi::Value(runtime, nativeConstructor));
 
-    JavaScriptObject::defineProperty(runtime, &prototype, nativeConstructorKey,
-                                     std::move(descriptor));
+    common::definePropertyOnJSIObject(runtime, &prototype, nativeConstructorKey.c_str(),
+                                      std::move(descriptor));
 
     moduleObject->setProperty(
       runtime,
@@ -321,29 +321,30 @@ void JavaScriptModuleObject::registerViewPrototype(
 
 void JavaScriptModuleObject::registerProperty(
   jni::alias_ref<jstring> name,
-  jni::alias_ref<ExpectedType> expectedArgType,
+  jboolean getterTakesOwner,
+  jni::alias_ref<jni::JArrayClass<ExpectedType>> getterExpectedArgsTypes,
   jni::alias_ref<JNIFunctionBody::javaobject> getter,
+  jboolean setterTakesOwner,
+  jni::alias_ref<jni::JArrayClass<ExpectedType>> setterExpectedArgsTypes,
   jni::alias_ref<JNIFunctionBody::javaobject> setter
 ) {
   auto cName = name->toStdString();
 
   auto getterMetadata = MethodMetadata(
     cName,
+    getterTakesOwner,
+    getterExpectedArgsTypes->size(),
     false,
-    0,
-    false,
-    std::vector<std::unique_ptr<AnyType>>(),
+    jni::make_local(getterExpectedArgsTypes),
     jni::make_global(getter)
   );
 
-  auto types = std::vector<std::unique_ptr<AnyType>>();
-  types.push_back(std::make_unique<AnyType>(jni::make_local(expectedArgType)));
   auto setterMetadata = MethodMetadata(
     cName,
+    setterTakesOwner,
+    setterExpectedArgsTypes->size(),
     false,
-    1,
-    false,
-    std::move(types),
+    jni::make_local(setterExpectedArgsTypes),
     jni::make_global(setter)
   );
 

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

@@ -122,8 +122,11 @@ public:
    */
   void registerProperty(
     jni::alias_ref<jstring> name,
-    jni::alias_ref<ExpectedType> expectedArgType,
+    jboolean getterTakesOwner,
+    jni::alias_ref<jni::JArrayClass<ExpectedType>> getterExpectedArgsTypes,
     jni::alias_ref<JNIFunctionBody::javaobject> getter,
+    jboolean setterTakesOwner,
+    jni::alias_ref<jni::JArrayClass<ExpectedType>> setterExpectedArgsTypes,
     jni::alias_ref<JNIFunctionBody::javaobject> setter
   );
 

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

@@ -112,7 +112,11 @@ 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::newInstance(runtimeHolder.getModuleRegistry(), runtimeHolder, jsFuncion);
+  return JavaScriptFunction::newInstance(
+    runtimeHolder.getModuleRegistry(),
+    runtimeHolder,
+    jsFuncion
+  );
 }
 
 void JavaScriptObject::setProperty(const std::string &name, jsi::Value value) {
@@ -143,27 +147,6 @@ jsi::Object JavaScriptObject::preparePropertyDescriptor(
   return descriptor;
 }
 
-void JavaScriptObject::defineProperty(
-  jsi::Runtime &runtime,
-  jsi::Object *jsthis,
-  const std::string &name,
-  jsi::Object descriptor
-) {
-  jsi::Object global = runtime.global();
-  jsi::Object objectClass = global.getPropertyAsObject(runtime, "Object");
-  jsi::Function definePropertyFunction = objectClass.getPropertyAsFunction(
-    runtime,
-    "defineProperty"
-  );
-
-  // This call is basically the same as `Object.defineProperty(object, name, descriptor)` in JS
-  definePropertyFunction.callWithThis(runtime, objectClass, {
-    jsi::Value(runtime, *jsthis),
-    jsi::String::createFromUtf8(runtime, name),
-    std::move(descriptor),
-  });
-}
-
 jni::local_ref<JavaScriptObject::javaobject> JavaScriptObject::newInstance(
   JSIInteropModuleRegistry *jsiInteropModuleRegistry,
   std::weak_ptr<JavaScriptRuntime> runtime,
@@ -179,7 +162,10 @@ void JavaScriptObject::defineNativeDeallocator(
 ) {
   auto &rt = runtimeHolder.getJSRuntime();
   jni::global_ref<JNIFunctionBody::javaobject> globalRef = jni::make_global(deallocator);
-  std::shared_ptr<ObjectDeallocator> nativeDeallocator = std::make_shared<ObjectDeallocator>(
+
+  common::setDeallocator(
+    rt,
+    jsObject,
     [globalRef = std::move(globalRef)]() mutable {
       auto args = jni::Environment::current()->NewObjectArray(
         0,
@@ -188,9 +174,8 @@ void JavaScriptObject::defineNativeDeallocator(
       );
       globalRef->invoke(args);
       globalRef.reset();
-    });
-  auto descriptor = JavaScriptObject::preparePropertyDescriptor(rt, 0);
-  descriptor.setProperty(rt, "value", jsi::Object::createFromHostObject(rt, nativeDeallocator));
-  jsObject->setProperty(rt, "__expo_shared_object_deallocator__", std::move(descriptor));
+    },
+    "__expo_shared_object_deallocator__"
+  );
 }
 } // namespace expo

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

@@ -8,6 +8,7 @@
 #include "WeakRuntimeHolder.h"
 #include "JNIFunctionBody.h"
 #include "JNIDeallocator.h"
+#include "JSIUtils.h"
 
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
@@ -71,13 +72,6 @@ public:
 
   static jsi::Object preparePropertyDescriptor(jsi::Runtime &jsRuntime, int options);
 
-  static void defineProperty(
-    jsi::Runtime &runtime,
-    jsi::Object *jsthis,
-    const std::string &name,
-    jsi::Object descriptor
-  );
-
   void defineNativeDeallocator(
     jni::alias_ref<JNIFunctionBody::javaobject> deallocator
   );
@@ -139,7 +133,7 @@ private:
     auto cName = name->toStdString();
     jsi::Object descriptor = preparePropertyDescriptor(jsRuntime, options);
     descriptor.setProperty(jsRuntime, "value", jsi_type_converter<T>::convert(jsRuntime, value));
-    JavaScriptObject::defineProperty(jsRuntime, jsObject.get(), cName, std::move(descriptor));
+    common::definePropertyOnJSIObject(jsRuntime, jsObject.get(), cName.c_str(), std::move(descriptor));
   }
 };
 } // namespace expo