expo-modules-core 0.11.4 → 0.11.5

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.11.5 — 2022-09-01
+
+### 🐛 Bug fixes
+
+- Removed the hard dependency to Hermes or JSC in *libexpo-modules-core.so* on Android and fixed the broken support for react-native-v8. ([#18899](https://github.com/expo/expo/pull/18899) by [@kudo](https://github.com/kudo))
+
 ## 0.11.4 — 2022-08-18
 
 ### 🐛 Bug fixes

package/android/CMakeLists.txt

@@ -5,6 +5,7 @@ set(CMAKE_ANDROID_STL_TYPE c++_shared)
 set(CMAKE_CXX_STANDARD 17)
 set(PACKAGE_NAME "expo-modules-core")
 set(BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
+set(ignoreMe "${HERMES_HEADER_DIR}")
 
 if (${NATIVE_DEBUG})
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
@@ -16,12 +17,23 @@ file(GLOB sources_android "${SRC_DIR}/main/cpp/*.cpp")
 
 # shared
 
+macro(createVarAsBoolToInt name value)
+  if(${value})
+    set(${name} "1")
+  else()
+    set(${name} "0")
+  endif()
+endmacro()
+
 add_library(
         ${PACKAGE_NAME}
         SHARED
         ${sources_android}
 )
 
+createVarAsBoolToInt("USE_HERMES_INT" ${USE_HERMES})
+createVarAsBoolToInt("UNIT_TEST_INT" ${UNIT_TEST})
+
 # Extracted AAR: ${BUILD_DIR}/react-native-0*/jni/${ANDROID_ABI}
 file(GLOB LIBRN_DIR "${REACT_NATIVE_SO_DIR}/${ANDROID_ABI}")
 if (NOT LIBRN_DIR)
@@ -31,7 +43,33 @@ if (NOT LIBRN_DIR)
 endif ()
 
 file(GLOB libfbjni_include_DIRS "${BUILD_DIR}/fbjni-*-headers.jar/")
-file(GLOB HERMES_SO_DIR "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}")
+
+# tests
+
+if(${UNIT_TEST})
+  if(${USE_HERMES})
+    file(GLOB HERMES_SO_DIR "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}")
+    find_library(
+        JSEXECUTOR_LIB
+        hermes
+        PATHS ${HERMES_SO_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+    )
+    set(JSEXECUTOR_INCLUDE "${HERMES_HEADER_DIR}")
+  else()
+    find_library(
+        JSEXECUTOR_LIB
+        jscexecutor
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+    )
+    set(JSEXECUTOR_INCLUDE "")
+  endif()
+else()
+  set(JSEXECUTOR_LIB "")
+  set(JSEXECUTOR_INCLUDE "")
+endif()
+
 
 # includes
 
@@ -47,11 +85,11 @@ target_include_directories(
         "${REACT_NATIVE_DIR}/ReactCommon/react/nativemodule/core"
         "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
         "${REACT_NATIVE_DIR}/ReactCommon/jsi"
-        "${HERMES_HEADER_DIR}"
         "${BUILD_DIR}/third-party-ndk/boost/boost_${BOOST_VERSION}"
         "${BUILD_DIR}/third-party-ndk/double-conversion"
         "${BUILD_DIR}/third-party-ndk/folly"
         ${libfbjni_include_DIRS}
+        "${JSEXECUTOR_INCLUDE}"
 )
 
 # find libraries
@@ -102,20 +140,6 @@ find_library(
         NO_CMAKE_FIND_ROOT_PATH
 )
 
-find_library(
-        HERMES_LIB
-        hermes
-        PATHS ${HERMES_SO_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-
-find_library(
-        JSEXECUTOR_LIB
-        jscexecutor
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-
 #reactnativejni
 
 # linking
@@ -127,7 +151,8 @@ target_compile_options(
         -DFOLLY_HAVE_MEMRCHR=1
         -DFOLLY_USE_LIBCPP=1
         -DFOLLY_MOBILE=1
-        -DFOR_HERMES=${FOR_HERMES}
+        -DUSE_HERMES=${USE_HERMES_INT}
+        -DUNIT_TEST=${UNIT_TEST_INT}
         -O2
         -frtti
         -fexceptions
@@ -135,29 +160,14 @@ target_compile_options(
         -fstack-protector-all
 )
 
-if (${FOR_HERMES})
-    target_link_libraries(
-            ${PACKAGE_NAME}
-            ${LOG_LIB}
-            ${FBJNI_LIB}
-            ${JSI_LIB}
-            ${HERMES_LIB}
-            ${REACT_NATIVE_JNI_LIB}
-            ${FOLLY_LIB}
-            ${REACT_NATIVE_MODULES_CORE}
-            android
-    )
-else ()
-    target_link_libraries(
-            ${PACKAGE_NAME}
-            ${LOG_LIB}
-            ${FBJNI_LIB}
-            ${JSI_LIB}
-            ${JSEXECUTOR_LIB}
-            ${REACT_NATIVE_JNI_LIB}
-            ${FOLLY_LIB}
-            ${REACT_NATIVE_MODULES_CORE}
-            android
-    )
-endif ()
-
+target_link_libraries(
+        ${PACKAGE_NAME}
+        ${LOG_LIB}
+        ${FBJNI_LIB}
+        ${JSI_LIB}
+        ${JSEXECUTOR_LIB}
+        ${REACT_NATIVE_JNI_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.11.4'
+version = '0.11.5'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -39,11 +39,11 @@ buildscript {
   }
 }
 
-def isAndroidTest() {
+def isAndroidTest = {
   Gradle gradle = getGradle()
   String tskReqStr = gradle.getStartParameter().getTaskRequests().toString()
   return tskReqStr.contains("AndroidTest")
-}
+}.call()
 
 def downloadsDir = new File("$buildDir/downloads")
 def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
@@ -78,21 +78,24 @@ def currentHermesVersion = file("${REACT_NATIVE_DIR}/sdks/.hermesversion").exist
 def hasHermesProject = findProject(":ReactAndroid:hermes-engine") != null
 def prebuiltHermesCacheHit = hasHermesProject && currentHermesVersion == prebuiltHermesVersion
 
-def FOR_HERMES = false
+def USE_HERMES = false
 def HERMES_HEADER_DIR = null
 def HERMES_AAR = null
 if (findProject(":app")) {
   def appProjectExt = project(":app").ext
   if (appProjectExt.has("react")) {
-    FOR_HERMES = project(":app").ext.react.enableHermes
+    USE_HERMES = project(":app").ext.react.enableHermes
   } else {
-    FOR_HERMES = (findProperty('expo.jsEngine') ?: "jsc") == "hermes"
+    USE_HERMES = (findProperty('expo.jsEngine') ?: "jsc") == "hermes"
   }
 } else {
-  FOR_HERMES = (findProperty('expo.jsEngine') ?: "jsc") == "hermes"
+  USE_HERMES = (findProperty('expo.jsEngine') ?: "jsc") == "hermes"
 }
 
-if (FOR_HERMES) {
+// Currently the needs for hermes/jsc are only for androidTest, so we turn on this flag only when `isAndroidTest` is true
+USE_HERMES = USE_HERMES && isAndroidTest
+
+if (USE_HERMES) {
   if (prebuiltHermesCacheHit) {
     HERMES_HEADER_DIR = file("${thirdPartyNdkDir}/hermes/prefab/modules/libhermes/include")
     HERMES_AAR = file("${prebuiltHermesDir}/hermes-engine-debug.aar")
@@ -158,7 +161,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "0.11.4"
+    versionName "0.11.5"
 
     testInstrumentationRunner "expo.modules.TestRunner"
 
@@ -169,8 +172,9 @@ android {
           "-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_HEADER_DIR=${HERMES_HEADER_DIR}"
+          "-DUSE_HERMES=${USE_HERMES}",
+          "-DHERMES_HEADER_DIR=${HERMES_HEADER_DIR}",
+          "-DUNIT_TEST=${isAndroidTest}"
       }
     }
   }
@@ -203,7 +207,7 @@ android {
 
     // In android (instrumental) tests, we want to package all so files to enable our JSI functionality.
     // Otherwise, those files should be excluded, because will be loaded by the application.
-    if (isAndroidTest()) {
+    if (isAndroidTest) {
       excludes = [
         "META-INF/MANIFEST.MF",
         "META-INF/com.android.tools/proguard/coroutines.pro",
@@ -277,7 +281,7 @@ dependencies {
   androidTestImplementation "com.google.truth:truth:1.1.2"
   androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
 
-  if (FOR_HERMES) {
+  if (USE_HERMES) {
     def hermesProject = findProject(":ReactAndroid:hermes-engine")
     androidTestImplementation (hermesProject ?: files(HERMES_AAR))
   } else {
@@ -438,7 +442,7 @@ task prepareFolly(dependsOn: [downloadFolly], type: Copy) {
 // END FOLLy
 
 task prepareHermes(dependsOn: createNativeDepsDirectories) {
-  if (!FOR_HERMES) {
+  if (!USE_HERMES) {
     return
   }
 
@@ -453,13 +457,16 @@ task prepareHermes(dependsOn: createNativeDepsDirectories) {
   }
 }
 
-task prepareThirdPartyNdkHeaders(dependsOn: [prepareBoost, prepareDoubleConversion, prepareFolly, prepareHermes]) {}
+task prepareThirdPartyNdkHeaders(dependsOn: [prepareBoost, prepareDoubleConversion, prepareFolly]) {}
 
 afterEvaluate {
   extractAARHeaders.dependsOn(prepareThirdPartyNdkHeaders)
   extractJNIFiles.dependsOn(prepareThirdPartyNdkHeaders)
-  if (hasHermesProject && !prebuiltHermesCacheHit) {
-    prepareHermes.dependsOn(":ReactAndroid:hermes-engine:assembleDebug")
+  if (USE_HERMES) {
+    prepareThirdPartyNdkHeaders.dependsOn(prepareHermes)
+    if (hasHermesProject && !prebuiltHermesCacheHit) {
+      prepareHermes.dependsOn(":ReactAndroid:hermes-engine:assembleDebug")
+    }
   }
 }
 

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

@@ -58,6 +58,9 @@ void JSIInteropModuleRegistry::installJSI(
 }
 
 void JSIInteropModuleRegistry::installJSIForTests() {
+#if !UNIT_TEST
+  throw std::logic_error("The function is only avaiable when UNIT_TEST is defined.");
+#else
   runtimeHolder = std::make_shared<JavaScriptRuntime>();
   jsi::Runtime &jsiRuntime = *runtimeHolder->get();
 
@@ -71,6 +74,7 @@ void JSIInteropModuleRegistry::installJSIForTests() {
       "ExpoModules",
       std::move(expoModulesObject)
     );
+#endif // !UNIT_TEST
 }
 
 jni::local_ref<JavaScriptModuleObject::javaobject>

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

@@ -5,7 +5,9 @@
 #include "JavaScriptObject.h"
 #include "Exceptions.h"
 
-#if FOR_HERMES
+#if UNIT_TEST
+
+#if USE_HERMES
 
 #include <hermes/hermes.h>
 
@@ -17,6 +19,8 @@
 
 #endif
 
+#endif // UNIT_TEST
+
 namespace jsi = facebook::jsi;
 
 namespace expo {
@@ -32,7 +36,10 @@ void SyncCallInvoker::invokeSync(std::function<void()> &&func) {
 JavaScriptRuntime::JavaScriptRuntime()
   : jsInvoker(std::make_shared<SyncCallInvoker>()),
     nativeInvoker(std::make_shared<SyncCallInvoker>()) {
-#if FOR_HERMES
+#if !UNIT_TEST
+  throw std::logic_error("The JavaScriptRuntime constructor is only avaiable when UNIT_TEST is defined.");
+#else
+#if USE_HERMES
   auto config = ::hermes::vm::RuntimeConfig::Builder()
     .withEnableSampleProfiling(false);
   runtime = facebook::hermes::makeHermesRuntime(config.build());
@@ -67,6 +74,7 @@ JavaScriptRuntime::JavaScriptRuntime()
     jsi::PropNameID::forUtf8(*runtime, "global"),
     runtime->global()
   );
+#endif // !UNIT_TEST
 }
 
 JavaScriptRuntime::JavaScriptRuntime(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "3c7309583130b8cc6e2a54e69bda41ca9c709826"
+  "gitHead": "9508df4babe9f5418a79c1fc1628c48936c206de"
 }