expo-modules-core 2.0.4 → 2.0.5

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 2.0.5 — 2024-11-22
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed build error when using jsEngine=jsc. ([#33130](https://github.com/expo/expo/pull/33130) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- [Android] Introduced `applyKspJvmToolchain()` gradle helper to enforce JVM Toolchain version for KSP. ([#33148](https://github.com/expo/expo/pull/33148) by [@kudo](https://github.com/kudo))
+
 ## 2.0.4 — 2024-11-19
 
 ### 🎉 New features
@@ -24,6 +34,8 @@
 ### 💡 Others
 
 - Use `findNodeHandle` with a native ref instead of a class component instance to avoid expensive calls to `findCurrentFiberUsingSlowPath`. ([#33016](https://github.com/expo/expo/pull/33016) by [@tsapeta](https://github.com/tsapeta))
+- Introduced `ReactNativeFeatureFlags` compat to fix React Native 0.77 breaking changes. ([#33077](https://github.com/expo/expo/pull/33077) by [@kudo](https://github.com/kudo))
+- Fixed compatibility for React Native 0.77. ([#33079](https://github.com/expo/expo/pull/33079) by [@kudo](https://github.com/kudo))
 
 ## 2.0.3 — 2024-11-14
 

package/ExpoModulesCore.podspec

@@ -47,13 +47,16 @@ Pod::Spec.new do |s|
   s.static_framework = true
   s.header_dir     = 'ExpoModulesCore'
 
-  header_search_paths = []
+  header_search_paths = [
+    '"$(PODS_ROOT)/Headers/Private/React-Core"', # as React-RCTAppDelegate.podspec to access JSCExecutorFactory.h
+  ]
   if ENV['USE_FRAMEWORKS']
     header_search_paths.concat([
       # [begin] transitive dependencies of React-RCTAppDelegate that are not defined modules
       '"${PODS_CONFIGURATION_BUILD_DIR}/React-RuntimeApple/React_RuntimeApple.framework/Headers"',
       '"${PODS_CONFIGURATION_BUILD_DIR}/React-RuntimeCore/React_RuntimeCore.framework/Headers"',
       '"${PODS_CONFIGURATION_BUILD_DIR}/React-jserrorhandler/React_jserrorhandler.framework/Headers"',
+      '"${PODS_CONFIGURATION_BUILD_DIR}/React-jsinspector/jsinspector_modern.framework/Headers"',
       '"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimescheduler/React_runtimescheduler.framework/Headers"',
       '"${PODS_CONFIGURATION_BUILD_DIR}/React-performancetimeline/React_performancetimeline.framework/Headers"',
       '"${PODS_CONFIGURATION_BUILD_DIR}/React-rendererconsistency/React_rendererconsistency.framework/Headers"',

package/android/ExpoModulesCorePlugin.gradle

@@ -26,7 +26,8 @@ class KotlinExpoModulesCorePlugin implements Plugin<Project> {
           "1.8.10": "1.8.10-1.0.9",
           "1.8.22": "1.8.22-1.0.11",
           "1.9.23": "1.9.23-1.0.20",
-          "1.9.24": "1.9.24-1.0.20"
+          "1.9.24": "1.9.24-1.0.20",
+          "2.0.21": "2.0.21-1.0.27"
         ]
 
         project.rootProject.ext.has("kspVersion")
@@ -50,6 +51,13 @@ ext.applyKotlinExpoModulesCorePlugin = {
   apply plugin: KotlinExpoModulesCorePlugin
 }
 
+// Apply JVM Toolchain version for KSP
+ext.applyKspJvmToolchain = {
+  project.ksp {
+    kotlin.jvmToolchain(17)
+  }
+}
+
 // Setup build options that are common for all modules
 ext.useDefaultAndroidSdkVersions = {
   project.android {

package/android/build.gradle

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '2.0.4'
+version = '2.0.5'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -67,7 +67,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.0.4"
+    versionName "2.0.5"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"
@@ -141,6 +141,18 @@ android {
     }
   }
 
+  sourceSets {
+    main {
+      java {
+        if (REACT_NATIVE_TARGET_VERSION >= 77) {
+          srcDirs += 'src/rn77'
+        } else {
+          // TODO(kudo,20241112): Remove this when we drop react-native 0.76 support
+          srcDirs += 'src/rn74'
+        }
+      }
+    }
+  }
 
   testOptions {
     unitTests.includeAndroidResources = true

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

@@ -41,7 +41,7 @@ class FilteredReadableMap(
   private val backingMap: ReadableMap,
   private val filteredKeys: List<String>
 ) : ReadableMap by backingMap {
-  override val entryIterator: Iterator<Map.Entry<String, Any>> =
+  override val entryIterator =
     FilteredIterator(backingMap.entryIterator) {
       !filteredKeys.contains(it.key)
     }

package/android/src/rn74/expo/modules/rncompatibility/ReactNativeFeatureFlags.kt

@@ -0,0 +1,14 @@
+@file:Suppress("DEPRECATION")
+
+package expo.modules.rncompatibility
+
+import com.facebook.react.config.ReactFeatureFlags
+
+/**
+ * A compatibility helper of
+ * `com.facebook.react.config.ReactFeatureFlags` and
+ * `com.facebook.react.internal.featureflags.ReactNativeFeatureFlags`
+ */
+object ReactNativeFeatureFlags {
+  val enableBridgelessArchitecture = ReactFeatureFlags.enableBridgelessArchitecture
+}

package/android/src/rn77/expo/modules/rncompatibility/ReactNativeFeatureFlags.kt

@@ -0,0 +1,12 @@
+package expo.modules.rncompatibility
+
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+
+/**
+ * A compatibility helper of
+ * `com.facebook.react.config.ReactFeatureFlags` and
+ * `com.facebook.react.internal.featureflags.ReactNativeFeatureFlags`
+ */
+object ReactNativeFeatureFlags {
+  val enableBridgelessArchitecture = ReactNativeFeatureFlags.enableBridgelessArchitecture()
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-native": "^12.5.2",
     "expo-module-scripts": "^4.0.0"
   },
-  "gitHead": "128718d43bac2eaed764b3551469b95400f2363e"
+  "gitHead": "6cbc7c671f769d36e4294f25a9445281912e45fd"
 }