expo-modules-core 1.12.20 → 1.12.22

package/CHANGELOG.md

@@ -10,6 +10,21 @@
 
 ### 💡 Others
 
+## 1.12.22 — 2024-08-20
+
+_This version does not introduce any user-facing changes._
+
+## 1.12.21 — 2024-08-14
+
+### 🐛 Bug fixes
+
+- [iOS] Fix getExternalPathPermissions returns no read/write permissions. ([#30540](https://github.com/expo/expo/pull/30540) by [@dispelpowerone](https://github.com/dispelpowerone))
+- [android] Fix accessing the `runtimeExecutor` from kotlin when the new arch is enabled. ([#31058](https://github.com/expo/expo/pull/31058) by [@alanjhughes](https://github.com/alanjhughes))
+
+### ⚠️ Notices
+
+- Added support for React Native 0.75.x. ([#30902](https://github.com/expo/expo/pull/30902) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ## 1.12.20 — 2024-07-29
 
 ### 💡 Others

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '1.12.20'
+version = '1.12.22'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -63,7 +63,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.12.20"
+    versionName "1.12.22"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/java/expo/modules/kotlin/AppContext.kt

@@ -9,6 +9,7 @@ import android.view.View
 import androidx.annotation.UiThread
 import androidx.appcompat.app.AppCompatActivity
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.turbomodule.core.CallInvokerHolderImpl
 import com.facebook.react.uimanager.UIManagerHelper
@@ -166,11 +167,22 @@ class AppContext(
 
         @Suppress("DEPRECATION")
         if (reactContext.isBridgeless) {
+          val runtimeExecutor: RuntimeExecutor = try {
+            // When react-native version >= 0.75.0 get runtimeExecutor from catalystInstance
+            val catalystInstanceField = reactContext.javaClass.getDeclaredField("catalystInstance")
+            val catalystInstance = catalystInstanceField.get(reactContext)
+            val runtimeExecutorField = catalystInstance.javaClass.getDeclaredField("runtimeExecutor")
+            runtimeExecutorField.get(catalystInstance) as RuntimeExecutor
+          } catch (e: NoSuchFieldException) {
+            val method = reactContext.javaClass.getMethod("getRuntimeExecutor")
+            method.invoke(reactContext) as RuntimeExecutor
+          }
+
           jsiInterop.installJSIForBridgeless(
             this,
             jsRuntimePointer,
             jniDeallocator,
-            reactContext.runtimeExecutor!!
+            runtimeExecutor
           )
         } else {
           jsiInterop.installJSI(

package/android/src/main/java/expo/modules/kotlin/defaultmodules/CoreModule.kt

@@ -4,7 +4,6 @@ import com.facebook.react.ReactActivity
 import com.facebook.react.ReactDelegate
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.config.ReactFeatureFlags
-import com.facebook.react.devsupport.DisabledDevSupportManager
 import expo.modules.kotlin.events.normalizeEventName
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
@@ -70,7 +69,15 @@ class CoreModule : Module() {
         ?: return@AsyncFunction
       if (!ReactFeatureFlags.enableBridgelessArchitecture) {
         val reactInstanceManager = reactDelegate.reactInstanceManager
-        if (reactInstanceManager.devSupportManager is DisabledDevSupportManager) {
+
+        var devSupportManagerClass: Class<*>
+        try {
+          // react-native version 0.75.0 renamed DisabledDevSupportManager to ReleaseDevSupportManager
+          devSupportManagerClass = Class.forName("com.facebook.react.devsupport.ReleaseDevSupportManager")
+        } catch (e: ClassNotFoundException) {
+          devSupportManagerClass = Class.forName("com.facebook.react.devsupport.DisabledDevSupportManager")
+        }
+        if (devSupportManagerClass.isInstance(reactInstanceManager.devSupportManager)) {
           UiThreadUtil.runOnUiThread {
             reactInstanceManager.recreateReactContextInBackground()
           }

package/android/src/main/java/expo/modules/kotlin/views/FilteredReadableMap.kt

@@ -41,7 +41,14 @@ class FilteredReadableMap(
   private val backingMap: ReadableMap,
   private val filteredKeys: List<String>
 ) : ReadableMap by backingMap {
-  override fun getEntryIterator(): Iterator<Map.Entry<String, Any>> =
+  @Suppress("NOTHING_TO_OVERRIDE", "INAPPLICABLE_JVM_NAME")
+  @JvmName("getEntryIteratorFromFunction")
+  override fun getEntryIterator(): Iterator<Map.Entry<String, Any>> = entryIterator
+
+  // Fallback for react-native 0.75.0 compatibility
+  @Suppress("NOTHING_TO_OVERRIDE", "INAPPLICABLE_JVM_NAME")
+  @get:JvmName("getEntryIteratorFromProperty")
+  override val entryIterator: Iterator<Map.Entry<String, Any>> =
     FilteredIterator(backingMap.entryIterator) {
       !filteredKeys.contains(it.key)
     }

package/ios/FileSystemUtilities/FileSystemLegacyUtilities.swift

@@ -110,10 +110,10 @@ public class FileSystemLegacyUtilities: NSObject, EXInternalModule, EXFileSystem
       return []
     }
     var filePermissions: EXFileSystemPermissionFlags = []
-    if FileManager.default.isReadableFile(atPath: url.absoluteString) {
+    if FileManager.default.isReadableFile(atPath: url.path) {
       filePermissions.insert(.read)
     }
-    if FileManager.default.isWritableFile(atPath: url.absoluteString) {
+    if FileManager.default.isWritableFile(atPath: url.path) {
       filePermissions.insert(.write)
     }
     return filePermissions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.12.20",
+  "version": "1.12.22",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "89cb316cd1f16193ae9841d2aec2ae39e0ee00bb"
+  "gitHead": "80d038d11d216793d00fa5b4607a2c6169cee814"
 }