expo 44.0.4 → 45.0.0-beta.1

package/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Changelog
+
+## Unpublished
+
+### 🛠 Breaking changes
+
+### 🎉 New features
+
+### 🐛 Bug fixes
+
+### 💡 Others
+
+## 45.0.0-beta.1 — 2022-04-18
+
+_This version does not introduce any user-facing changes._
+
+## 45.0.0-beta.1 — 2022-04-18
+
+_This version does not introduce any user-facing changes._
+
+## 45.0.0-beta.1 — 2022-04-18
+
+### 🎉 New features
+
+- Add `EXPO_USE_BETA_CLI` to utilize the new `@expo/cli` versioned package. ([#17007](https://github.com/expo/expo/pull/17007) by [@EvanBacon](https://github.com/EvanBacon))
+- Added Android `ReactNativeHostHandler.getJavaScriptExecutorFactory()` for a module to override the `JavaScriptExecutorFactory`. ([#17005](https://github.com/expo/expo/pull/17005) by [@kudo](https://github.com/kudo))
+- Add `react`, `react-native`, `react-dom`, and `react-native-web` to `bundledNativeModules.json`. ([#17048](https://github.com/expo/expo/pull/17048) by [@EvanBacon](https://github.com/EvanBacon))

package/android/.gitignore

@@ -0,0 +1,261 @@
+
+# Created by https://www.gitignore.io/api/java,maven,gradle,android,intellij,androidstudio
+
+### Android ###
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+### Android Patch ###
+gen-external-apklibs
+
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+
+# Built application files
+
+# Files for the ART/Dalvik VM
+
+# Java class files
+
+# Generated files
+
+# Gradle files
+.gradle
+
+# Signing files
+.signing/
+
+# Local configuration file (sdk path, etc)
+
+# Proguard folder generated by Eclipse
+
+# Log Files
+
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+*.ipr
+*~
+*.swp
+
+# Android Patch
+
+# External native build folder generated in Android Studio 2.2 and later
+
+# NDK
+obj/
+
+# IntelliJ IDEA
+*.iws
+/out/
+
+# User-specific configurations
+.idea/libraries/
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+hs_err_pid*
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+
+## Plugin-specific files:
+
+# IntelliJ
+
+# mpeltonen/sbt-idea plugin
+
+# JIRA plugin
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Ruby plugin and RubyMine
+/.rakeTasks
+
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Java ###
+# Compiled class file
+
+# Log file
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+
+# Package Files #
+*.jar
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
+
+### Gradle ###
+**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+
+# End of https://www.gitignore.io/api/java,maven,gradle,android,intellij,androidstudio

package/android/build.gradle

@@ -1,76 +1,115 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 // Import autolinking script
 apply from: "../scripts/autolinking.gradle"
 
+static def versionToNumber(major, minor, patch) {
+  return patch * 100 + minor * 10000 + major * 1000000
+}
+
+def getRNVersion() {
+  def nodeModulesVersion = [
+      "node",
+      "-e",
+      "console.log(require('react-native/package.json').version);"
+  ]
+      .execute([], projectDir)
+      .text
+      .trim()
+
+  def version = safeExtGet("reactNativeVersion", nodeModulesVersion)
+  def coreVersion = version.split("-")[0]
+  def (major, minor, patch) = coreVersion.tokenize('.').collect { it.toInteger() }
+
+  return versionToNumber(
+      major,
+      minor,
+      patch
+  )
+}
+
 ensureDependeciesWereEvaluated(project)
 
 group = 'host.exp.exponent'
-version = '44.0.4'
+version = '45.0.0-beta.1'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
-//Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
-
-//Creating sources with comments
+// Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
   from android.sourceSets.main.java.srcDirs
 }
 
-//Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 1
-    versionName "44.0.4"
+    versionName "45.0.0-beta.1"
     consumerProguardFiles("proguard-rules.pro")
   }
   lintOptions {
     abortOnError false
   }
-  kotlinOptions {
-    jvmTarget = '1.8'
-  }
   testOptions {
     unitTests.includeAndroidResources = true
   }
@@ -79,16 +118,16 @@ android {
     main {
       java {
         srcDirs += new File(project.buildDir, generatedFilesSrcDir)
+
+        def rnVersion = getRNVersion()
+        if (rnVersion >= versionToNumber(0, 67, 0)) {
+          srcDirs += "src/reactNativeHostWrapper"
+        } else {
+          srcDirs += "src/legacyReactNativeHostWrapper"
+        }
       }
     }
   }
-
-  unitTestVariants.all {
-    it.mergedFlavor.manifestPlaceholders = [
-      // Fix expo-app-auth manifest merger issue for unit test
-      appAuthRedirectScheme: "test"
-    ]
-  }
 }
 
 dependencies { dependencyHandler ->

package/android/proguard-rules.pro

@@ -1,8 +1,11 @@
-# For ReactNativeDelegateWrapper
+# For ReactActivityDelegateWrapper
 -keepclassmembers public class com.facebook.react.ReactActivityDelegate {
   protected *;
   private ReactDelegate mReactDelegate;
 }
+-keepclassmembers public class com.facebook.react.ReactActivity {
+  private final ReactActivityDelegate mDelegate;
+}
 
 # For ReactNativeHostWrapper
 -keepclassmembers public class com.facebook.react.ReactNativeHost {

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

@@ -0,0 +1,9 @@
+package expo.modules
+
+import android.app.Application
+import com.facebook.react.ReactNativeHost
+
+class ReactNativeHostWrapper(
+  application: Application,
+  host: ReactNativeHost
+) : ReactNativeHostWrapperBase(application, host)

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.KeyEvent
+import android.view.ViewGroup
 import androidx.collection.ArrayMap
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
@@ -14,12 +15,18 @@ 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.Field
 import java.lang.reflect.Method
+import java.lang.reflect.Modifier
 
 class ReactActivityDelegateWrapper(
   private val activity: ReactActivity,
-  private val delegate: ReactActivityDelegate
+  private val isNewArchitectureEnabled: Boolean,
+  private var delegate: ReactActivityDelegate
 ) : ReactActivityDelegate(activity, null) {
+  constructor(activity: ReactActivity, delegate: ReactActivityDelegate) :
+    this(activity, false, delegate)
+
   private val reactActivityLifecycleListeners = ExpoModulesPackage.packageList
     .flatMap { it.createReactActivityLifecycleListeners(activity) }
   private val reactActivityHandlers = ExpoModulesPackage.packageList
@@ -33,9 +40,11 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun createRootView(): ReactRootView {
-    return reactActivityHandlers.asSequence()
+    val rootView = reactActivityHandlers.asSequence()
       .mapNotNull { it.createReactRootView(activity) }
       .firstOrNull() ?: invokeDelegateMethod("createRootView")
+    rootView.setIsFabric(isNewArchitectureEnabled)
+    return rootView
   }
 
   override fun getReactNativeHost(): ReactNativeHost {
@@ -51,26 +60,59 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun loadApp(appKey: String?) {
-    return invokeDelegateMethod("loadApp", arrayOf(String::class.java), arrayOf(appKey))
+    // Give modules a chance to wrap the ReactRootView in a container ViewGroup. If some module
+    // wants to do this, we override the functionality of `loadApp` and call `setContentView` with
+    // the new container view instead.
+    val rootViewContainer = reactActivityHandlers.asSequence()
+      .mapNotNull { it.createReactRootViewContainer(activity) }
+      .firstOrNull()
+    if (rootViewContainer != null) {
+      val mReactDelegate = ReactActivityDelegate::class.java.getDeclaredField("mReactDelegate")
+      mReactDelegate.isAccessible = true
+      val reactDelegate = mReactDelegate[delegate] as ReactDelegate
+
+      reactDelegate.loadApp(appKey)
+      rootViewContainer.addView(reactDelegate.reactRootView, ViewGroup.LayoutParams.MATCH_PARENT)
+      activity.setContentView(rootViewContainer)
+    } else {
+      return invokeDelegateMethod("loadApp", arrayOf(String::class.java), arrayOf(appKey))
+    }
   }
 
   override fun onCreate(savedInstanceState: Bundle?) {
-    // Since we just wrap `ReactActivityDelegate` but not inherit it, in its `onCreate`,
-    // the calls to `createRootView()` or `getMainComponentName()` have no chances to be our wrapped methods.
-    // Instead we intercept `ReactActivityDelegate.onCreate` and replace the `mReactDelegate` with our version.
-    // That's not ideal but works.
-    val reactDelegate = object : ReactDelegate(
-      plainActivity, reactNativeHost, mainComponentName, launchOptions
-    ) {
-      override fun createRootView(): ReactRootView {
-        return this@ReactActivityDelegateWrapper.createRootView()
+    // Give handlers a chance as early as possible to replace the wrapped delegate object.
+    // If they do, we call the new wrapped delegate's `onCreate` instead of overriding it here.
+    val newDelegate = reactActivityHandlers.asSequence()
+      .mapNotNull { it.onDidCreateReactActivityDelegate(activity, this) }
+      .firstOrNull()
+    if (newDelegate != null && newDelegate != this) {
+      val mDelegateField = ReactActivity::class.java.getDeclaredField("mDelegate")
+      mDelegateField.isAccessible = true
+      val modifiers = Field::class.java.getDeclaredField("accessFlags")
+      modifiers.isAccessible = true
+      modifiers.setInt(mDelegateField, mDelegateField.modifiers and Modifier.FINAL.inv())
+      mDelegateField.set(activity, newDelegate)
+      delegate = newDelegate
+
+      invokeDelegateMethod<Unit, Bundle?>("onCreate", arrayOf(Bundle::class.java), arrayOf(savedInstanceState))
+    } else {
+      // Since we just wrap `ReactActivityDelegate` but not inherit it, in its `onCreate`,
+      // the calls to `createRootView()` or `getMainComponentName()` have no chances to be our wrapped methods.
+      // Instead we intercept `ReactActivityDelegate.onCreate` and replace the `mReactDelegate` with our version.
+      // That's not ideal but works.
+      val reactDelegate = object : ReactDelegate(
+        plainActivity, reactNativeHost, mainComponentName, launchOptions
+      ) {
+        override fun createRootView(): ReactRootView {
+          return this@ReactActivityDelegateWrapper.createRootView()
+        }
+      }
+      val mReactDelegate = ReactActivityDelegate::class.java.getDeclaredField("mReactDelegate")
+      mReactDelegate.isAccessible = true
+      mReactDelegate.set(delegate, reactDelegate)
+      if (mainComponentName != null) {
+        loadApp(mainComponentName)
       }
-    }
-    val mReactDelegate = ReactActivityDelegate::class.java.getDeclaredField("mReactDelegate")
-    mReactDelegate.isAccessible = true
-    mReactDelegate.set(delegate, reactDelegate)
-    if (mainComponentName != null) {
-      loadApp(mainComponentName)
     }
 
     reactActivityLifecycleListeners.forEach { listener ->
@@ -108,7 +150,11 @@ class ReactActivityDelegateWrapper(
   }
 
   override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
-    return delegate.onKeyUp(keyCode, event)
+    // if any of the handlers return true, intentionally consume the event instead of passing it
+    // through to the delegate
+    return reactActivityHandlers
+      .map { it.onKeyUp(keyCode, event) }
+      .fold(false) { accu, current -> accu || current } || delegate.onKeyUp(keyCode, event)
   }
 
   override fun onKeyLongPress(keyCode: Int, event: KeyEvent?): Boolean {

package/android/src/main/java/expo/modules/{ReactNativeHostWrapper.kt → ReactNativeHostWrapperBase.kt}

@@ -14,11 +14,11 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.devsupport.RedBoxHandler
 import java.lang.reflect.Method
 
-class ReactNativeHostWrapper(
+open class ReactNativeHostWrapperBase(
   application: Application,
-  private val host: ReactNativeHost
+  protected val host: ReactNativeHost
 ) : ReactNativeHost(application) {
-  private val reactNativeHostHandlers = ExpoModulesPackage.packageList
+  internal val reactNativeHostHandlers = ExpoModulesPackage.packageList
     .flatMap { it.createReactNativeHostHandlers(application) }
   private val methodMap: ArrayMap<String, Method> = ArrayMap()
 
@@ -44,7 +44,9 @@ class ReactNativeHostWrapper(
   }
 
   override fun getJavaScriptExecutorFactory(): JavaScriptExecutorFactory? {
-    return invokeDelegateMethod("getJavaScriptExecutorFactory")
+    return reactNativeHostHandlers.asSequence()
+      .mapNotNull { it.javaScriptExecutorFactory }
+      .firstOrNull() ?: invokeDelegateMethod("getJavaScriptExecutorFactory")
   }
 
   @Suppress("DEPRECATION")
@@ -100,7 +102,7 @@ class ReactNativeHostWrapper(
   }
 
   @Suppress("UNCHECKED_CAST")
-  private fun <T> invokeDelegateMethod(name: String): T {
+  internal fun <T> invokeDelegateMethod(name: String): T {
     var method = methodMap[name]
     if (method == null) {
       method = ReactNativeHost::class.java.getDeclaredMethod(name)

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

@@ -0,0 +1,32 @@
+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
+
+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
+  }
+}

package/android/src/test/AndroidManifest.xml

@@ -0,0 +1,18 @@
+<manifest package="expo.modules.appauth"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
+    <application>
+
+        <!-- Fix unit test manifestMerger build error from expo -> autolinked expo-app-auth -> net.openid.appauth -->
+        <activity
+	    android:name="net.openid.appauth.RedirectUriReceiverActivity"
+            android:exported="true" tools:node="replace">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="test" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>