expo 44.0.0-beta.1 → 44.0.2

package/android/build.gradle

@@ -8,7 +8,7 @@ apply from: "../scripts/autolinking.gradle"
 ensureDependeciesWereEvaluated(project)
 
 group = 'host.exp.exponent'
-version = '44.0.0-beta.1'
+version = '44.0.2'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -62,7 +62,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 1
-    versionName "44.0.0-beta.1"
+    versionName "44.0.2"
     consumerProguardFiles("proguard-rules.pro")
   }
   lintOptions {
@@ -71,6 +71,9 @@ android {
   kotlinOptions {
     jvmTarget = '1.8'
   }
+  testOptions {
+    unitTests.includeAndroidResources = true
+  }
 
   sourceSets {
     main {
@@ -79,12 +82,24 @@ android {
       }
     }
   }
+
+  unitTestVariants.all {
+    it.mergedFlavor.manifestPlaceholders = [
+      // Fix expo-app-auth manifest merger issue for unit test
+      appAuthRedirectScheme: "test"
+    ]
+  }
 }
 
 dependencies { dependencyHandler ->
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
 
+  testImplementation 'junit:junit:4.13.1'
+  testImplementation 'androidx.test:core:1.4.0'
+  testImplementation "com.google.truth:truth:1.1.2"
+  testImplementation 'io.mockk:mockk:1.12.0'
+
   // Link expo modules as dependencies of the adapter. It uses `api` configuration so they all will be visible for the app as well.
   // A collection of the dependencies depends on the options passed to `useExpoModules` in your project's `settings.gradle`.
   addExpoModulesDependencies(dependencyHandler, project)

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

@@ -13,6 +13,7 @@ import com.facebook.react.ReactInstanceManager
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactRootView
 import com.facebook.react.modules.core.PermissionListener
+import expo.modules.core.interfaces.ReactActivityLifecycleListener
 import java.lang.reflect.Method
 
 class ReactActivityDelegateWrapper(
@@ -45,7 +46,7 @@ class ReactActivityDelegateWrapper(
     return delegate.reactInstanceManager
   }
 
-  override fun getMainComponentName(): String {
+  override fun getMainComponentName(): String? {
     return delegate.mainComponentName
   }
 
@@ -115,11 +116,19 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onBackPressed(): Boolean {
-    return delegate.onBackPressed()
+    val listenerResult = reactActivityLifecycleListeners
+      .map(ReactActivityLifecycleListener::onBackPressed)
+      .fold(false) { accu, current -> accu || current }
+    val delegateResult = delegate.onBackPressed()
+    return listenerResult || delegateResult
   }
 
   override fun onNewIntent(intent: Intent?): Boolean {
-    return delegate.onNewIntent(intent)
+    val listenerResult = reactActivityLifecycleListeners
+      .map { it.onNewIntent(intent) }
+      .fold(false) { accu, current -> accu || current }
+    val delegateResult = delegate.onNewIntent(intent)
+    return listenerResult || delegateResult
   }
 
   override fun onWindowFocusChanged(hasFocus: Boolean) {

package/android/src/test/java/expo/modules/ReactActivityDelegateWrapperTest.kt

@@ -0,0 +1,109 @@
+package expo.modules
+
+import android.content.Context
+import android.content.Intent
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.google.common.truth.Truth.assertThat
+import expo.modules.core.interfaces.Package
+import expo.modules.core.interfaces.ReactActivityHandler
+import expo.modules.core.interfaces.ReactActivityLifecycleListener
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.RelaxedMockK
+import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.unmockkAll
+import io.mockk.verify
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+internal class ReactActivityDelegateWrapperTest {
+  lateinit var mockPackage0: MockPackage
+
+  lateinit var mockPackage1: MockPackage
+
+  @RelaxedMockK
+  lateinit var activity: ReactActivity
+
+  @RelaxedMockK
+  lateinit var delegate: ReactActivityDelegate
+
+  @Before
+  fun setUp() {
+    mockPackage0 = MockPackage()
+    mockPackage1 = MockPackage()
+    MockKAnnotations.init(this)
+    mockkObject(ExpoModulesPackage.Companion)
+    every { ExpoModulesPackage.Companion.packageList } returns listOf(mockPackage0, mockPackage1)
+  }
+
+  @After
+  fun tearDown() {
+    unmockkAll()
+  }
+
+  @Test
+  fun `onBackPressed should call each handler's callback just once`() {
+    val delegateWrapper = ReactActivityDelegateWrapper(activity, delegate)
+    every { mockPackage0.reactActivityLifecycleListener.onBackPressed() } returns true
+
+    delegateWrapper.onBackPressed()
+
+    verify(exactly = 1) { mockPackage0.reactActivityLifecycleListener.onBackPressed() }
+    verify(exactly = 1) { mockPackage1.reactActivityLifecycleListener.onBackPressed() }
+    verify(exactly = 1) { delegate.onBackPressed() }
+  }
+
+  @Test
+  fun `onBackPressed should return true if someone returns true`() {
+    val delegateWrapper = ReactActivityDelegateWrapper(activity, delegate)
+    every { mockPackage0.reactActivityLifecycleListener.onBackPressed() } returns false
+    every { mockPackage1.reactActivityLifecycleListener.onBackPressed() } returns true
+    every { delegate.onBackPressed() } returns false
+
+    val result = delegateWrapper.onBackPressed()
+    assertThat(result).isTrue()
+  }
+
+  @Test
+  fun `onNewIntent should call each handler's callback just once`() {
+    val intent = mockk<Intent>()
+    val delegateWrapper = ReactActivityDelegateWrapper(activity, delegate)
+    every { mockPackage0.reactActivityLifecycleListener.onNewIntent(intent) } returns false
+    every { mockPackage1.reactActivityLifecycleListener.onNewIntent(intent) } returns true
+    every { delegate.onNewIntent(intent) } returns false
+
+    delegateWrapper.onNewIntent(intent)
+
+    verify(exactly = 1) { mockPackage0.reactActivityLifecycleListener.onNewIntent(any()) }
+    verify(exactly = 1) { mockPackage1.reactActivityLifecycleListener.onNewIntent(any()) }
+    verify(exactly = 1) { delegate.onNewIntent(any()) }
+  }
+
+  @Test
+  fun `onNewIntent should return true if someone returns true`() {
+    val intent = mockk<Intent>()
+    val delegateWrapper = ReactActivityDelegateWrapper(activity, delegate)
+    every { mockPackage0.reactActivityLifecycleListener.onNewIntent(intent) } returns false
+    every { mockPackage1.reactActivityLifecycleListener.onNewIntent(intent) } returns true
+    every { delegate.onNewIntent(intent) } returns false
+
+    val result = delegateWrapper.onNewIntent(intent)
+    assertThat(result).isTrue()
+  }
+}
+
+internal class MockPackage : Package {
+  val reactActivityLifecycleListener = mockk<ReactActivityLifecycleListener>(relaxed = true)
+  val reactActivityHandler = mockk<ReactActivityHandler>(relaxed = true)
+
+  override fun createReactActivityLifecycleListeners(activityContext: Context?): List<ReactActivityLifecycleListener> {
+    return listOf(reactActivityLifecycleListener)
+  }
+
+  override fun createReactActivityHandlers(activityContext: Context?): List<ReactActivityHandler> {
+    return listOf(reactActivityHandler)
+  }
+}

package/bundledNativeModules.json

@@ -20,7 +20,7 @@
   "expo-app-loading": "~1.3.0",
   "expo-apple-authentication": "~4.1.0",
   "expo-application": "~4.0.1",
-  "expo-asset": "~8.4.4",
+  "expo-asset": "~8.4.5",
   "expo-auth-session": "~3.5.0",
   "expo-av": "~10.2.0",
   "expo-background-fetch": "~10.1.0",
@@ -37,7 +37,7 @@
   "expo-constants": "~13.0.0",
   "expo-contacts": "~10.1.0",
   "expo-crypto": "~10.1.1",
-  "expo-dev-client": "~0.7.1",
+  "expo-dev-client": "~0.7.2",
   "expo-device": "~4.1.0",
   "expo-document-picker": "~10.1.0",
   "expo-error-recovery": "~3.0.4",
@@ -55,7 +55,7 @@
   "expo-haptics": "~11.1.0",
   "expo-image-loader": "~3.1.0",
   "expo-image-manipulator": "~10.2.0",
-  "expo-image-picker": "~12.0.0",
+  "expo-image-picker": "~12.0.1",
   "expo-in-app-purchases": "~12.1.0",
   "expo-intent-launcher": "~10.1.0",
   "expo-keep-awake": "~10.0.1",
@@ -63,41 +63,41 @@
   "expo-linking": "~3.0.0",
   "expo-local-authentication": "~12.1.0",
   "expo-localization": "~12.0.0",
-  "expo-location": "~14.0.0",
+  "expo-location": "~14.0.1",
   "expo-mail-composer": "~11.1.0",
   "expo-media-library": "~14.0.0",
   "expo-module-template": "~10.1.0",
-  "expo-modules-core": "~0.6.1",
+  "expo-modules-core": "~0.6.3",
   "expo-navigation-bar": "~1.1.1",
   "expo-network": "~4.1.0",
   "expo-notifications": "~0.14.0",
   "expo-permissions": "~13.1.0",
   "expo-print": "~11.1.0",
-  "expo-random": "~12.1.0",
+  "expo-random": "~12.1.1",
   "expo-screen-orientation": "~4.1.1",
   "expo-secure-store": "~11.1.0",
   "expo-sensors": "~11.1.0",
   "expo-sharing": "~10.1.0",
   "expo-sms": "~10.1.0",
   "expo-speech": "~10.1.0",
-  "expo-splash-screen": "~0.14.0",
+  "expo-splash-screen": "~0.14.1",
   "expo-sqlite": "~10.1.0",
   "expo-status-bar": "~1.2.0",
   "expo-store-review": "~5.1.0",
   "expo-system-ui": "~1.1.0",
   "expo-task-manager": "~10.1.0",
   "expo-tracking-transparency": "~2.1.0",
-  "expo-updates": "~0.11.1",
+  "expo-updates": "~0.11.3",
   "expo-video-thumbnails": "~6.1.0",
   "expo-web-browser": "~10.1.0",
   "lottie-react-native": "5.0.1",
   "react-native-appearance": "~0.3.3",
   "react-native-branch": "5.0.0",
-  "react-native-gesture-handler": "~2.0.0",
+  "react-native-gesture-handler": "~2.1.0",
   "react-native-get-random-values": "~1.7.0",
   "react-native-maps": "0.29.4",
   "react-native-pager-view": "5.4.9",
-  "react-native-reanimated": "~2.3.0",
+  "react-native-reanimated": "~2.3.1",
   "react-native-safe-area-context": "3.3.2",
   "react-native-screens": "~3.10.1",
   "react-native-shared-element": "0.8.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo",
-  "version": "44.0.0-beta.1",
+  "version": "44.0.2",
   "description": "The Expo SDK",
   "main": "build/Expo.js",
   "module": "build/Expo.js",
@@ -57,16 +57,16 @@
     "@babel/runtime": "^7.14.0",
     "@expo/metro-config": "~0.2.6",
     "@expo/vector-icons": "^12.0.4",
-    "babel-preset-expo": "~9.0.1",
+    "babel-preset-expo": "~9.0.2",
     "cross-spawn": "^6.0.5",
     "expo-application": "~4.0.1",
-    "expo-asset": "~8.4.4",
+    "expo-asset": "~8.4.5",
     "expo-constants": "~13.0.0",
     "expo-file-system": "~13.1.0",
     "expo-font": "~10.0.4",
     "expo-keep-awake": "~10.0.1",
-    "expo-modules-autolinking": "0.5.0",
-    "expo-modules-core": "0.6.1",
+    "expo-modules-autolinking": "0.5.3",
+    "expo-modules-core": "0.6.3",
     "fbemitter": "^2.1.1",
     "invariant": "^2.2.4",
     "md5-file": "^3.2.3",
@@ -88,5 +88,5 @@
     "react-dom": "17.0.1",
     "react-native": "0.64.3"
   },
-  "gitHead": "cf8e7fde1b19e10dd9b74a8af0e9362ae8e14001"
+  "gitHead": "15af6a1b326913842a4a5453f38f872974f1c846"
 }

package/scripts/autolinking.rb

@@ -3,6 +3,7 @@ require 'pathname'
 require 'colored2' # dependency of CocoaPods
 
 require File.join(File.dirname(`node --print "require.resolve('expo-modules-autolinking/package.json')"`), "scripts/ios/autolinking_manager")
+require File.join(File.dirname(`node --print "require.resolve('expo-modules-autolinking/package.json')"`), "scripts/ios/react_import_patcher")
 
 def use_expo_modules!(options = {})
   # When run from the Podfile, `self` points to Pod::Podfile object
@@ -14,3 +15,12 @@ def use_expo_modules!(options = {})
 
   @current_target_definition.autolinking_manager = Expo::AutolinkingManager.new(self, @current_target_definition, options).use_expo_modules!
 end
+
+def expo_patch_react_imports!(installer, options = {})
+  unless installer.is_a?(Pod::Installer)
+    Pod::UI.warn 'expo_patch_react_imports!() - Invalid `installer` parameter'.red
+    return
+  end
+
+  Expo::ReactImportPatcher.new(installer, options).run!
+end