expo-modules-core 0.11.3 → 0.11.4

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 0.11.4 — 2022-08-18
+
+### 🐛 Bug fixes
+
+- Fix issue with Android builds when gradle clean and build were called concurrently.  ([#18518](https://github.com/expo/expo/pull/18518) by [EdwardDrapkin](https://github.com/EdwardDrapkin))
+- Fixed `FabricUIManager` errors when turning on new architecture mode on Android. ([#18472](https://github.com/expo/expo/pull/18472) by [@kudo](https://github.com/kudo))
+
 ## 0.11.3 — 2022-07-18
 
 ### 💡 Others

package/android/CMakeLists.txt

@@ -47,7 +47,7 @@ target_include_directories(
         "${REACT_NATIVE_DIR}/ReactCommon/react/nativemodule/core"
         "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
         "${REACT_NATIVE_DIR}/ReactCommon/jsi"
-        "${HERMES_DIR}/android/include"
+        "${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"

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '0.11.3'
+version = '0.11.4'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -71,8 +71,15 @@ def reactNativeArchitectures() {
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
+// HERMES
+def prebuiltHermesDir = findProperty("expo.prebuiltHermesDir") ?: file("${REACT_NATIVE_DIR}/ReactAndroid/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 prebuiltHermesCacheHit = hasHermesProject && currentHermesVersion == prebuiltHermesVersion
+
 def FOR_HERMES = false
-def HERMES_ENGINE_DIR = null
+def HERMES_HEADER_DIR = null
 def HERMES_AAR = null
 if (findProject(":app")) {
   def appProjectExt = project(":app").ext
@@ -86,23 +93,30 @@ if (findProject(":app")) {
 }
 
 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")
+  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 {
+    // 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.
+    def hermesEngineDir = new File(["node", "--print", "require.resolve('hermes-engine/package.json')"].execute(null, rootDir).text.trim()).parent
+
     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")
+      HERMES_AAR = file("${hermesEngineDir}/android/hermes-debug.aar")
     }
+    HERMES_HEADER_DIR = file("${hermesEngineDir}/android/include")
   }
 }
+// END HERMES
+
 
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
@@ -144,7 +158,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "0.11.3"
+    versionName "0.11.4"
 
     testInstrumentationRunner "expo.modules.TestRunner"
 
@@ -156,7 +170,7 @@ android {
           "-DREACT_NATIVE_TARGET_VERSION=${REACT_NATIVE_TARGET_VERSION}",
           "-DBOOST_VERSION=${BOOST_VERSION}",
           "-DFOR_HERMES=${FOR_HERMES}",
-          "-DHERMES_DIR=${HERMES_ENGINE_DIR}"
+          "-DHERMES_HEADER_DIR=${HERMES_HEADER_DIR}"
       }
     }
   }
@@ -264,7 +278,8 @@ dependencies {
   androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
 
   if (FOR_HERMES) {
-    androidTestImplementation files(HERMES_AAR)
+    def hermesProject = findProject(":ReactAndroid:hermes-engine")
+    androidTestImplementation (hermesProject ?: files(HERMES_AAR))
   } else {
     androidTestImplementation "org.webkit:android-jsc:+"
   }
@@ -422,17 +437,19 @@ task prepareFolly(dependsOn: [downloadFolly], type: Copy) {
 }
 // END FOLLy
 
-task prepareHermes() {
+task prepareHermes(dependsOn: createNativeDepsDirectories) {
   if (!FOR_HERMES) {
     return
   }
 
-  def soFiles = zipTree(HERMES_AAR).matching({ it.include "**/*.so" })
+  doLast {
+    def files = zipTree(HERMES_AAR).matching({ it.include "**/*.so", "prefab/modules/libhermes/include/**/*" })
 
-  copy {
-    from soFiles
-    from "$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/first-party/hermes/Android.mk"
-    into "$thirdPartyNdkDir/hermes"
+    copy {
+      from files
+      from "$REACT_NATIVE_DIR/ReactAndroid/src/main/jni/first-party/hermes/Android.mk"
+      into "$thirdPartyNdkDir/hermes"
+    }
   }
 }
 
@@ -441,10 +458,13 @@ task prepareThirdPartyNdkHeaders(dependsOn: [prepareBoost, prepareDoubleConversi
 afterEvaluate {
   extractAARHeaders.dependsOn(prepareThirdPartyNdkHeaders)
   extractJNIFiles.dependsOn(prepareThirdPartyNdkHeaders)
+  if (hasHermesProject && !prebuiltHermesCacheHit) {
+    prepareHermes.dependsOn(":ReactAndroid:hermes-engine:assembleDebug")
+  }
 }
 
 tasks.whenTaskAdded { task ->
-  if (!task.name.contains("Clean") && (task.name.contains('externalNativeBuild') || task.name.startsWith('configureCMake'))) {
+  if (!task.name.contains("Clean") && (task.name.contains('externalNativeBuild') || task.name.startsWith('configureCMake') || task.name.startsWith('buildCMake'))) {
     def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
     task.dependsOn(extractAARHeaders)
     task.dependsOn(extractJNIFiles)

package/android/src/main/java/expo/modules/adapters/react/ModuleRegistryAdapter.java

@@ -54,7 +54,7 @@ public class ModuleRegistryAdapter implements ReactPackage {
 
     List<NativeModule> nativeModules = getNativeModulesFromModuleRegistry(reactContext, moduleRegistry);
     if (mWrapperDelegateHolders != null) {
-      KotlinInteropModuleRegistry kotlinInteropModuleRegistry = mModulesProxy.getKotlinInteropModuleRegistry();
+      KotlinInteropModuleRegistry kotlinInteropModuleRegistry = getOrCreateNativeModulesProxy(reactContext).getKotlinInteropModuleRegistry();
       kotlinInteropModuleRegistry.updateModuleHoldersInViewManagers(mWrapperDelegateHolders);
     }
 
@@ -64,8 +64,7 @@ public class ModuleRegistryAdapter implements ReactPackage {
   protected List<NativeModule> getNativeModulesFromModuleRegistry(ReactApplicationContext reactContext, ModuleRegistry moduleRegistry) {
     List<NativeModule> nativeModulesList = new ArrayList<>(2);
 
-    mModulesProxy = createNativeModulesProxy(reactContext, moduleRegistry);
-    nativeModulesList.add(mModulesProxy);
+    nativeModulesList.add(getOrCreateNativeModulesProxy(reactContext));
 
     // Add listener that will notify expo.modules.core.ModuleRegistry when all modules are ready
     nativeModulesList.add(new ModuleRegistryReadyNotifier(moduleRegistry));
@@ -94,8 +93,7 @@ public class ModuleRegistryAdapter implements ReactPackage {
       }
     }
 
-    // We assume that `createNativeModules` was called first.
-    NativeModulesProxy modulesProxy = Objects.requireNonNull(mModulesProxy);
+    NativeModulesProxy modulesProxy = Objects.requireNonNull(getOrCreateNativeModulesProxy(reactContext));
     KotlinInteropModuleRegistry kotlinInteropModuleRegistry = modulesProxy.getKotlinInteropModuleRegistry();
     List<ViewManager<?, ?>> kViewManager = kotlinInteropModuleRegistry.exportViewManagers();
     // Saves all holders that needs to be in sync with module registry
@@ -105,11 +103,15 @@ public class ModuleRegistryAdapter implements ReactPackage {
     return viewManagerList;
   }
 
-  private NativeModulesProxy createNativeModulesProxy(ReactApplicationContext reactContext, ModuleRegistry moduleRegistry) {
-    if (mModulesProvider != null) {
-      return new NativeModulesProxy(reactContext, moduleRegistry, mModulesProvider);
-    } else {
-      return new NativeModulesProxy(reactContext, moduleRegistry);
+  private NativeModulesProxy getOrCreateNativeModulesProxy(ReactApplicationContext reactContext) {
+    if (mModulesProxy == null) {
+      ModuleRegistry moduleRegistry = mModuleRegistryProvider.get(reactContext);
+      if (mModulesProvider != null) {
+        mModulesProxy = new NativeModulesProxy(reactContext, moduleRegistry, mModulesProvider);
+      } else {
+        mModulesProxy = new NativeModulesProxy(reactContext, moduleRegistry);
+      }
     }
+    return mModulesProxy;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "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": "5d900179d047d9f4d89c0b9953b7121a1f1df8a2"
+  "gitHead": "3c7309583130b8cc6e2a54e69bda41ca9c709826"
 }