expo-modules-core 0.10.0 → 0.11.2

package/CHANGELOG.md

@@ -10,6 +10,28 @@
 
 ### 💡 Others
 
+## 0.11.2 — 2022-07-16
+
+### 🐛 Bug fixes
+
+- Fix dangling pointer in the fbjni from the MethodMetadata::createPromiseBody on Android. ([#18206](https://github.com/expo/expo/pull/18206) by [@lukmccall](https://github.com/lukmccall))
+
+## 0.11.1 — 2022-07-11
+
+### 🐛 Bug fixes
+
+- Fixed a crash when remote debugging is enabled on Android. ([#18165](https://github.com/expo/expo/pull/18165) by [@kudo](https://github.com/kudo))
+
+## 0.11.0 — 2022-07-07
+
+### 🎉 New features
+
+- Create `AppContext.registerForActivityResult` mechanism similar to [`ComponentActivity.registerForActivityResult`](https://developer.android.com/training/basics/intents/result)). ([#17572](https://github.com/expo/expo/pull/17572), ([#17987](https://github.com/expo/expo/pull/17987) by [@bbarthec](https://github.com/bbarthec))
+
+### 🐛 Bug fixes
+
+- Added support for React Native 0.69.x ([#18006](https://github.com/expo/expo/pull/18006) by [@kudo](https://github.com/kudo))
+
 ## 0.10.0 — 2022-06-23
 
 ### 🎉 New features
@@ -28,6 +50,7 @@
 - Fix modules have not been deallocated during the application reload on iOS. ([#17285](https://github.com/expo/expo/pull/17285) by [@lukmccall](https://github.com/lukmccall))
 - Fix view props weren't recognized in the bare workflow on iOS. ([#17411](https://github.com/expo/expo/pull/17411) by [@lukmccall](https://github.com/lukmccall))
 - Fix support for optional function arguments on iOS. ([#17950](https://github.com/expo/expo/pull/17950) by [@barthap](https://github.com/barthap))
+- Added support for React Native 0.69.x ([#17629](https://github.com/expo/expo/pull/17629) by [@kudo](https://github.com/kudo))
 
 ### 💡 Others
 

package/README.md

@@ -36,7 +36,7 @@ Many React Native libraries come with platform-specific (native) code. This nati
 # Podfile
 
 require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
-require File.join(File.dirname(`node --print "require.resolve('react-native-unimodules/package.json')"`), "cocoapods.rb")
+require File.join(File.dirname(`node --print "require.resolve('expo-modules-core/package.json')"`), "cocoapods.rb")
 require File.join(File.dirname(`node --print "require.resolve('expo-modules-core/package.json')"`), "scripts/autolinking")
 
 #  ...
@@ -55,7 +55,7 @@ end
 ```groovy
 // app/build.gradle
 
-apply from: new File(["node", "--print", "require.resolve('react-native-unimodules/package.json')"].execute(null, rootDir).text.trim(), "../gradle.groovy")
+apply from: new File(["node", "--print", "require.resolve('expo-modules-core/package.json')"].execute(null, rootDir).text.trim(), "../gradle.groovy")
 apply from: new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim(), "../react.gradle")
 apply from: new File(["node", "--print", "require.resolve('expo-updates/package.json')"].execute(null, rootDir).text.trim(), "../scripts/create-manifest-android.gradle")
 
@@ -68,7 +68,7 @@ applyNativeModulesAppBuildGradle(project)
 ```groovy
 // settings.gradle
 
-apply from: new File(["node", "--print", "require.resolve('react-native-unimodules/package.json')"].execute(null, rootDir).text.trim(), "../gradle.groovy");
+apply from: new File(["node", "--print", "require.resolve('expo-modules-core/package.json')"].execute(null, rootDir).text.trim(), "../gradle.groovy");
 includeUnimodulesProjects()
 
 apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle");

package/android/CMakeLists.txt

@@ -58,12 +58,21 @@ target_include_directories(
 
 find_library(LOG_LIB log)
 
-find_library(
-        FOLLY_JSON_LIB
+if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+    find_library(
+        FOLLY_LIB
         folly_json
         PATHS ${LIBRN_DIR}
         NO_CMAKE_FIND_ROOT_PATH
-)
+    )
+else()
+    find_library(
+        FOLLY_LIB
+        folly_runtime
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+    )
+endif()
 
 find_library(
         FBJNI_LIB
@@ -134,7 +143,7 @@ if (${FOR_HERMES})
             ${JSI_LIB}
             ${HERMES_LIB}
             ${REACT_NATIVE_JNI_LIB}
-            ${FOLLY_JSON_LIB}
+            ${FOLLY_LIB}
             ${REACT_NATIVE_MODULES_CORE}
             android
     )
@@ -146,7 +155,7 @@ else ()
             ${JSI_LIB}
             ${JSEXECUTOR_LIB}
             ${REACT_NATIVE_JNI_LIB}
-            ${FOLLY_JSON_LIB}
+            ${FOLLY_LIB}
             ${REACT_NATIVE_MODULES_CORE}
             android
     )

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '0.10.0'
+version = '0.11.2'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -48,9 +48,11 @@ def isAndroidTest() {
 def downloadsDir = new File("$buildDir/downloads")
 def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
 
-def REACT_NATIVE_DIR = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
 def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":ReactAndroid") != null
-def REACT_NATIVE_SO_DIR = findProject(":ReactAndroid")
+def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
+  ? findProject(":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")
   : "${buildDir}/react-native-0*/jni"
 
@@ -60,6 +62,7 @@ file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { react
 def FOLLY_VERSION = reactProperties.getProperty("FOLLY_VERSION")
 def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION")
 def DOUBLE_CONVERSION_VERSION = reactProperties.getProperty("DOUBLE_CONVERSION_VERSION")
+def REACT_NATIVE_TARGET_VERSION = reactProperties.getProperty("VERSION_NAME").split("\\.")[1].toInteger()
 
 def reactNativeThirdParty = new File("$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/third-party")
 
@@ -69,7 +72,8 @@ def reactNativeArchitectures() {
 }
 
 def FOR_HERMES = false
-def HERMES_DIR = new File(["node", "--print", "require.resolve('hermes-engine/package.json')"].execute(null, rootDir).text.trim()).parent
+def HERMES_ENGINE_DIR = null
+def HERMES_AAR = null
 if (findProject(":app")) {
   def appProjectExt = project(":app").ext
   if (appProjectExt.has("react")) {
@@ -81,6 +85,25 @@ if (findProject(":app")) {
   FOR_HERMES = (findProperty('expo.jsEngine') ?: "jsc") == "hermes"
 }
 
+if (FOR_HERMES) {
+  // The `hermes-engine` package doesn't contain the correct version of the Hermes.
+  // The AAR we need to import is located in the React Native package.
+  // However, the version from RN doesn't include header files.
+  // To get those, we must fall back to the `hermes-engine` package.
+  HERMES_ENGINE_DIR = new File(["node", "--print", "require.resolve('hermes-engine/package.json')"].execute(null, rootDir).text.trim()).parent
+  if (REACT_NATIVE_BUILD_FROM_SOURCE) {
+    // TODO(@lukmccall): Use Hermes from the `ReactAndroid:hermes-engine`
+    HERMES_AAR = file("$HERMES_ENGINE_DIR/android/hermes-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("$HERMES_ENGINE_DIR/android/hermes-debug.aar")
+    }
+  }
+}
+
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
@@ -121,7 +144,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "0.10.0"
+    versionName "0.11.2"
 
     testInstrumentationRunner "expo.modules.TestRunner"
 
@@ -130,9 +153,10 @@ android {
         abiFilters (*reactNativeArchitectures())
         arguments "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}",
           "-DREACT_NATIVE_SO_DIR=${REACT_NATIVE_SO_DIR}",
+          "-DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}",
           "-DBOOST_VERSION=${BOOST_VERSION}",
           "-DFOR_HERMES=${FOR_HERMES}",
-          "-DHERMES_DIR=${HERMES_DIR}"
+          "-DHERMES_DIR=${HERMES_ENGINE_DIR}"
       }
     }
   }
@@ -158,6 +182,7 @@ android {
       "**/libjscexecutor.so",
       "**/libfbjni.so",
       "**/libfolly_json.so",
+      "**/libfolly_runtime.so",
       "**/libhermes.so",
       "**/libjsi.so",
     ]
@@ -223,19 +248,6 @@ dependencies {
   compileOnly 'com.facebook.fbjni:fbjni:0.2.2'
   extractHeaders 'com.facebook.fbjni:fbjni:0.2.2:headers'
   extractJNI 'com.facebook.fbjni:fbjni:0.2.2'
-  def rnAARs = fileTree("${REACT_NATIVE_DIR}/android").matching { include "**/*.aar" }
-  if (rnAARs.any()) {
-    // node_modules/react-native has a .aar, extract headers
-    if (rnAARs.size() > 1) {
-      logger.error("More than one React Native AAR file has been found:")
-      rnAARs.each { println(it) }
-      throw new GradleException("Multiple React Native AARs found:\n${rnAARs.join("\n")}" +
-        "\nRemove the old ones and try again")
-    }
-    def rnAAR = rnAARs.singleFile
-    extractJNI(files(rnAAR))
-  }
-  // else - there is no prebuilt react-native.aar, this is most likely Expo Go
 
   testImplementation 'androidx.test:core:1.4.0'
   testImplementation 'junit:junit:4.13.1'
@@ -252,7 +264,7 @@ dependencies {
   androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
 
   if (FOR_HERMES) {
-    androidTestImplementation files(new File(HERMES_DIR, "android/hermes-debug.aar"))
+    androidTestImplementation files(HERMES_AAR)
   } else {
     androidTestImplementation "org.webkit:android-jsc:+"
   }
@@ -276,6 +288,44 @@ task createNativeDepsDirectories() {
 // END UTILS
 
 // JNI
+def extractReactNativeAAR = { buildType ->
+  def suffix = buildType == 'Debug' ? '-debug' : '-release'
+  def rnAARs = fileTree(REACT_NATIVE_DIR).matching { include "**/react-native/**/*${suffix}.aar" }
+  if (rnAARs.isEmpty()) {
+    rnAARs = fileTree(REACT_NATIVE_DIR).matching { include "**/react-native/**/*.aar" }
+  }
+  if (rnAARs.any()) {
+    // node_modules/react-native has a .aar, extract headers
+    if (rnAARs.size() > 1) {
+      logger.error("More than one React Native AAR file has been found:")
+      rnAARs.each {println(it) }
+      throw new GradleException("Multiple React Native AARs found:\n${rnAARs.join("\n")}" +
+          "\nRemove the old ones and try again")
+    }
+  }
+  def rnAAR = rnAARs.singleFile
+  def file = rnAAR.absoluteFile
+  def packageName = file.name.tokenize('-')[0]
+  copy {
+    from zipTree(file)
+    into "$buildDir/$file.name"
+    include "jni/**/*"
+  }
+}
+
+task extractReactNativeAARRelease {
+  doLast {
+    extractReactNativeAAR('Release')
+  }
+}
+
+task extractReactNativeAARDebug {
+  doLast {
+    extractReactNativeAAR('Debug')
+  }
+}
+
+
 task extractAARHeaders {
   doLast {
     configurations.extractHeaders.files.each {
@@ -305,7 +355,10 @@ task extractJNIFiles {
 
 // BOOST
 task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
-  src("https://github.com/react-native-community/boost-for-react-native/releases/download/v${BOOST_VERSION.replace("_", ".")}-0/boost_${BOOST_VERSION}.tar.gz")
+  def srcUrl = REACT_NATIVE_TARGET_VERSION >= 69
+    ? "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz"
+    : "https://github.com/react-native-community/boost-for-react-native/releases/download/v${BOOST_VERSION.replace("_", ".")}-0/boost_${BOOST_VERSION}.tar.gz"
+  src(srcUrl)
   onlyIfNewer(true)
   overwrite(false)
   dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))
@@ -374,12 +427,7 @@ task prepareHermes() {
     return
   }
 
-  def hermesAAR = file("$HERMES_DIR/android/hermes-debug.aar")
-  if (!hermesAAR.exists()) {
-    throw new GradleScriptException("The hermes-engine npm package is missing \"android/hermes-debug.aar\"", null)
-  }
-
-  def soFiles = zipTree(hermesAAR).matching({ it.include "**/*.so" })
+  def soFiles = zipTree(HERMES_AAR).matching({ it.include "**/*.so" })
 
   copy {
     from soFiles
@@ -397,11 +445,13 @@ afterEvaluate {
 
 tasks.whenTaskAdded { task ->
   if (!task.name.contains("Clean") && (task.name.contains('externalNativeBuild') || task.name.startsWith('configureCMake'))) {
+    def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
     task.dependsOn(extractAARHeaders)
     task.dependsOn(extractJNIFiles)
     if (REACT_NATIVE_BUILD_FROM_SOURCE) {
-      def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
       task.dependsOn(":ReactAndroid:copy${buildType}JniLibsProjectOnly")
+    } else {
+      task.dependsOn("extractReactNativeAAR${buildType}")
     }
   } else if (task.name.startsWith('generateJsonModel') && REACT_NATIVE_BUILD_FROM_SOURCE) {
     def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'

package/android/src/main/cpp/CachedReferencesRegistry.cpp

@@ -0,0 +1,67 @@
+// Copyright © 2021-present 650 Industries, Inc. (aka Expo)
+
+#include "CachedReferencesRegistry.h"
+
+#include <utility>
+
+namespace expo {
+std::shared_ptr<CachedReferencesRegistry> CachedReferencesRegistry::instance() {
+  static std::shared_ptr<CachedReferencesRegistry> singleton{new CachedReferencesRegistry};
+  return singleton;
+}
+
+void CachedReferencesRegistry::loadJClasses(JNIEnv *env) {
+  loadJClass(env, "java/lang/Double", {
+    {"<init>", "(D)V"}
+  });
+
+  loadJClass(env, "java/lang/Boolean", {
+    {"<init>", "(Z)V"}
+  });
+
+  loadJClass(env, "com/facebook/react/bridge/PromiseImpl", {
+    {"<init>", "(Lcom/facebook/react/bridge/Callback;Lcom/facebook/react/bridge/Callback;)V"}
+  });
+
+  loadJClass(env, "java/lang/Object", {});
+}
+
+void CachedReferencesRegistry::loadJClass(
+  JNIEnv *env,
+  const std::string &name,
+  const std::vector<std::pair<std::string, std::string>> &methodsNames
+) {
+  // Note this clazz variable points to a leaked global reference.
+  // This is appropriate for classes that are never unloaded which is any class in an Android app.
+  auto clazz = (jclass) env->NewGlobalRef(env->FindClass(name.c_str()));
+
+  MethodHashMap methods;
+  methods.reserve(methodsNames.size());
+
+  for (auto &method: methodsNames) {
+    methods.insert(
+      {method, env->GetMethodID(clazz, method.first.c_str(), method.second.c_str())}
+    );
+  }
+
+  jClassRegistry.insert(
+    {name, CachedJClass(clazz, std::move(methods))}
+  );
+}
+
+CachedReferencesRegistry::CachedJClass &CachedReferencesRegistry::getJClass(
+  const std::string &className
+) {
+  return jClassRegistry.at(className);
+}
+
+jmethodID CachedReferencesRegistry::CachedJClass::getMethod(const std::string &name,
+                                                            const std::string &signature) {
+  return methods.at({name, signature});
+}
+
+CachedReferencesRegistry::CachedJClass::CachedJClass(
+  jclass clazz,
+  MethodHashMap methods
+) : clazz(clazz), methods(std::move(methods)) {}
+} // namespace expo

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

@@ -0,0 +1,80 @@
+// Copyright © 2021-present 650 Industries, Inc. (aka Expo)
+
+#pragma once
+
+#include <jsi/jsi.h>
+#include <fbjni/fbjni.h>
+#include "boost/functional/hash.hpp"
+
+#include <memory>
+#include <unordered_map>
+
+namespace jni = facebook::jni;
+namespace jsi = facebook::jsi;
+
+namespace expo {
+using MethodHashMap = std::unordered_map<
+  std::pair<std::string, std::string>,
+  jmethodID,
+  boost::hash<std::pair<std::string, std::string>>
+>;
+
+/**
+ * Singleton registry used to store references to often used Java classes.
+ *
+ * TODO(@lukmccall): also store reference to jsi objects like `Promise`.
+ */
+class CachedReferencesRegistry {
+public:
+  /**
+   * An entry in the Java class registry.
+   */
+  class CachedJClass {
+  public:
+    CachedJClass(jclass clazz, MethodHashMap methods);
+
+    /**
+     * A bare reference to the class object.
+     */
+    jclass clazz;
+
+    /**
+     * Returns a cached method id for provided method name and signature.
+     */
+    jmethodID getMethod(const std::string &name, const std::string &signature);
+
+  private:
+    MethodHashMap methods;
+  };
+
+  CachedReferencesRegistry(CachedReferencesRegistry const &) = delete;
+
+  CachedReferencesRegistry &operator=(CachedReferencesRegistry const &) = delete;
+
+  /**
+   * Gets a singleton instance
+   */
+  static std::shared_ptr<CachedReferencesRegistry> instance();
+
+  /**
+   * Gets a cached Java class entry.
+   */
+  CachedJClass &getJClass(const std::string &className);
+
+  /**
+   * Loads predefined set of Java classes and stores them
+   */
+  void loadJClasses(JNIEnv *env);
+
+private:
+  CachedReferencesRegistry() = default;
+
+  std::unordered_map<std::string, CachedJClass> jClassRegistry;
+
+  void loadJClass(
+    JNIEnv *env,
+    const std::string &name,
+    const std::vector<std::pair<std::string, std::string>> &methods
+  );
+};
+} // namespace expo

package/android/src/main/cpp/JNIFunctionBody.cpp

@@ -1,28 +1,44 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
 #include "JNIFunctionBody.h"
+#include "CachedReferencesRegistry.h"
 
 namespace jni = facebook::jni;
 namespace react = facebook::react;
 
 namespace expo {
 jni::local_ref<react::ReadableNativeArray::javaobject>
-JNIFunctionBody::invoke(react::ReadableNativeArray::javaobject &&args) {
-  static const auto method = getClass()->getMethod<
-    react::ReadableNativeArray::javaobject(react::ReadableNativeArray::javaobject)
-  >(
-    "invoke"
-  );
+JNIFunctionBody::invoke(jobjectArray args) {
+  // Do NOT use getClass here!
+  // Method obtained from `getClass` will point to the overridden version of the method.
+  // Because of that, it can't be cached - we will try to invoke the nonexistent method
+  // if we receive an object of a different class than the one used to obtain the method id.
+  // The only cacheable method id can be obtain from the base class.
+  static const auto method = jni::findClassLocal("expo/modules/kotlin/jni/JNIFunctionBody")
+    ->getMethod<jni::local_ref<react::ReadableNativeArray::javaobject>(jobjectArray)>(
+      "invoke",
+      "([Ljava/lang/Object;)Lcom/facebook/react/bridge/ReadableNativeArray;"
+    );
 
   return method(this->self(), args);
 }
 
-void JNIAsyncFunctionBody::invoke(react::ReadableNativeArray::javaobject &&args, jobject promise) {
-  static const auto method = getClass()->getMethod<
-    void(react::ReadableNativeArray::javaobject, jobject)
-  >(
-    "invoke"
-  );
+void JNIAsyncFunctionBody::invoke(
+  jobjectArray args,
+  jobject promise
+) {
+  // Do NOT use getClass here!
+  // Method obtained from `getClass` will point to the overridden version of the method.
+  // Because of that, it can't be cached - we will try to invoke the nonexistent method
+  // if we receive an object of a different class than the one used to obtain the method id.
+  // The only cacheable method id can be obtain from the base class.
+  static const auto method = jni::findClassLocal("expo/modules/kotlin/jni/JNIAsyncFunctionBody")
+    ->getMethod<
+      void(jobjectArray , jobject)
+    >(
+      "invoke",
+      "([Ljava/lang/Object;Ljava/lang/Object;)V"
+    );
 
   method(this->self(), args, promise);
 }

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

@@ -24,7 +24,7 @@ public:
    * @return result of the Kotlin function
    */
   jni::local_ref<react::ReadableNativeArray::javaobject> invoke(
-    react::ReadableNativeArray::javaobject &&args
+    jobjectArray args
   );
 };
 
@@ -43,7 +43,7 @@ public:
    * @param promise that will be resolve or rejected in the Kotlin's implementation
    */
   void invoke(
-    react::ReadableNativeArray::javaobject &&args,
+    jobjectArray args,
     jobject promise
   );
 };

package/android/src/main/cpp/JNIInjector.cpp

@@ -4,6 +4,7 @@
 #include "JavaScriptModuleObject.h"
 #include "JavaScriptValue.h"
 #include "JavaScriptObject.h"
+#include "CachedReferencesRegistry.h"
 
 #include <jni.h>
 #include <fbjni/fbjni.h>
@@ -11,6 +12,9 @@
 // Install all jni bindings
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
+    // Loads references to often use Java classes
+    expo::CachedReferencesRegistry::instance()->loadJClasses(jni::Environment::current());
+
     expo::JSIInteropModuleRegistry::registerNatives();
     expo::JavaScriptModuleObject::registerNatives();
     expo::JavaScriptValue::registerNatives();