expo 47.0.11 → 47.0.13

package/android/build.gradle

@@ -19,22 +19,21 @@ def getRNVersion() {
       .text
       .trim()
 
-  def version = safeExtGet("reactNativeVersion", nodeModulesVersion)
+  def version = System.getenv("REACT_NATIVE_OVERRIDE_VERSION") ?: safeExtGet("reactNativeVersion", nodeModulesVersion)
   def coreVersion = version.split("-")[0]
   def (major, minor, patch) = coreVersion.tokenize('.').collect { it.toInteger() }
 
-  def versionNumber = versionToNumber(major, minor, patch)
-  if (versionNumber == versionToNumber(0, 0, 0)) {
-    // react-native nightly build published as `0.0.0-20221002-2027-2319f75c8` form, but its semantic is latest
-    return versionToNumber(9999, 9999, 9999)
-  }
-  return versionNumber
+  return versionToNumber(
+      major,
+      minor,
+      patch
+  )
 }
 
 ensureDependeciesWereEvaluated(project)
 
 group = 'host.exp.exponent'
-version = '47.0.11'
+version = '47.0.13'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -105,7 +104,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 1
-    versionName "47.0.11"
+    versionName "47.0.13"
     consumerProguardFiles("proguard-rules.pro")
   }
   lintOptions {
@@ -121,10 +120,12 @@ android {
         srcDirs += new File(project.buildDir, generatedFilesSrcDir)
 
         def rnVersion = getRNVersion()
-        if (rnVersion >= versionToNumber(0, 69, 0)) {
+        if (rnVersion >= versionToNumber(0, 71, 0)) {
           srcDirs += "src/reactNativeHostWrapper"
+        } else if (rnVersion >= versionToNumber(0, 69, 0)) {
+          srcDirs += "src/reactNativeHostWrapper69"
         } else if (rnVersion >= versionToNumber(0, 67, 0)) {
-          srcDirs += "src/reactNativeHostWrapper68"
+          srcDirs += "src/reactNativeHostWrapper67"
         } else {
           srcDirs += "src/reactNativeHostWrapper64"
         }

package/android/src/main/java/expo/modules/ReactNativeHostWrapperBase.kt

@@ -46,11 +46,6 @@ open class ReactNativeHostWrapperBase(
       .firstOrNull() ?: invokeDelegateMethod("getJavaScriptExecutorFactory")
   }
 
-  @Suppress("DEPRECATION")
-  override fun getUIImplementationProvider(): com.facebook.react.uimanager.UIImplementationProvider {
-    return invokeDelegateMethod("getUIImplementationProvider")
-  }
-
   override fun getJSIModulePackage(): JSIModulePackage? {
     val userJSIModulePackage = invokeDelegateMethod<JSIModulePackage?>("getJSIModulePackage")
     return JSIModuleContainerPackage(userJSIModulePackage)

package/android/src/reactNativeHostWrapper64/expo/modules/ReactNativeHostWrapper.kt

@@ -11,4 +11,9 @@ class ReactNativeHostWrapper(
   override fun getRedBoxHandler(): RedBoxHandler? {
     return invokeDelegateMethod("getRedBoxHandler")
   }
+
+  @Suppress("DEPRECATION")
+  override fun getUIImplementationProvider(): com.facebook.react.uimanager.UIImplementationProvider {
+    return invokeDelegateMethod("getUIImplementationProvider")
+  }
 }

package/android/src/{reactNativeHostWrapper68 → reactNativeHostWrapper67}/expo/modules/ReactNativeHostWrapper.kt

@@ -34,4 +34,9 @@ class ReactNativeHostWrapper(
   override fun getRedBoxHandler(): RedBoxHandler? {
     return invokeDelegateMethod("getRedBoxHandler")
   }
+
+  @Suppress("DEPRECATION")
+  override fun getUIImplementationProvider(): com.facebook.react.uimanager.UIImplementationProvider {
+    return invokeDelegateMethod("getUIImplementationProvider")
+  }
 }

package/android/src/reactNativeHostWrapper69/expo/modules/ReactNativeHostWrapper.kt

@@ -0,0 +1,42 @@
+package expo.modules
+
+import android.app.Application
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate
+import com.facebook.react.common.SurfaceDelegateFactory
+import com.facebook.react.devsupport.DevSupportManagerFactory
+import com.facebook.react.devsupport.interfaces.RedBoxHandler
+
+class ReactNativeHostWrapper(
+  application: Application,
+  host: ReactNativeHost
+) : ReactNativeHostWrapperBase(application, host) {
+  override fun getDevSupportManagerFactory(): DevSupportManagerFactory? {
+    return reactNativeHostHandlers
+      .asSequence()
+      .mapNotNull { it.devSupportManagerFactory }
+      .firstOrNull() as DevSupportManagerFactory?
+      ?: invokeDelegateMethod("getDevSupportManagerFactory")
+  }
+
+  override fun getReactPackageTurboModuleManagerDelegateBuilder(): ReactPackageTurboModuleManagerDelegate.Builder? {
+    return invokeDelegateMethod("getReactPackageTurboModuleManagerDelegateBuilder")
+  }
+
+  override fun getShouldRequireActivity(): Boolean {
+    return host.shouldRequireActivity
+  }
+
+  override fun getSurfaceDelegateFactory(): SurfaceDelegateFactory {
+    return host.surfaceDelegateFactory
+  }
+
+  override fun getRedBoxHandler(): RedBoxHandler? {
+    return invokeDelegateMethod("getRedBoxHandler")
+  }
+
+  @Suppress("DEPRECATION")
+  override fun getUIImplementationProvider(): com.facebook.react.uimanager.UIImplementationProvider {
+    return invokeDelegateMethod("getUIImplementationProvider")
+  }
+}

package/bundledNativeModules.json

@@ -59,7 +59,7 @@
   "expo-mail-composer": "~12.0.0",
   "expo-media-library": "~15.0.0",
   "expo-module-template": "~10.8.3",
-  "expo-modules-core": "~1.0.4 || ~1.1.0",
+  "expo-modules-core": "~1.0.4 || ~1.1.1",
   "expo-navigation-bar": "~2.0.1",
   "expo-network": "~5.0.0",
   "expo-notifications": "~0.17.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "47.0.11",
+  "version": "47.0.13",
   "description": "The Expo SDK",
   "main": "build/Expo.js",
   "module": "build/Expo.js",
@@ -71,8 +71,8 @@
     "expo-file-system": "~15.1.1",
     "expo-font": "~11.0.1",
     "expo-keep-awake": "~11.0.1",
-    "expo-modules-autolinking": "1.0.1",
-    "expo-modules-core": "1.1.0",
+    "expo-modules-autolinking": "1.0.2",
+    "expo-modules-core": "1.1.1",
     "fbemitter": "^3.0.0",
     "getenv": "^1.0.0",
     "invariant": "^2.2.4",
@@ -96,5 +96,5 @@
     "react-dom": "18.0.0",
     "react-native": "0.70.5"
   },
-  "gitHead": "ec1f0b3b3205645510214bea3a76e1f7d485e4ba"
+  "gitHead": "a6e4bf8dd47ead92a76ff1de79f866cca584f1b3"
 }