expo · Kudo · Jun 7, 2023 · Feb 27, 2023 · May 17, 2023 · May 17, 2023
diff --git a/.github/actions/expo-caches/action.yml b/.github/actions/expo-caches/action.yml
@@ -175,14 +175,14 @@ runs:
       uses: actions/cache@v3
       with:
         path: android/prebuiltHermes
-        key: hermes-engine-aar-v2-${{ hashFiles('react-native-lab/react-native/sdks/.hermesversion') }}
+        key: hermes-engine-aar-v2-${{ hashFiles('react-native-lab/react-native/packages/react-native/sdks/.hermesversion') }}
     - name: Check hermes-engine cache-hit
       if: inputs.hermes-engine-aar == 'true'
       id: cache-hermes-engine-aar
       shell: bash
       run: |
         CURRENT_VERSION=$(test -f android/prebuiltHermes/.hermesversion && cat android/prebuiltHermes/.hermesversion) || true
-        TARGET_VERSION=$(test -f react-native-lab/react-native/sdks/.hermesversion && cat react-native-lab/react-native/sdks/.hermesversion) || true
+        TARGET_VERSION=$(test -f react-native-lab/react-native/packages/react-native/sdks/.hermesversion && cat react-native-lab/react-native/packages/react-native/sdks/.hermesversion) || true
         if [[ $CURRENT_VERSION == $TARGET_VERSION ]]; then
           echo "cache-hit=true" >> $GITHUB_OUTPUT
         else
@@ -195,11 +195,11 @@ runs:
         # Ensure node packages are installed when yarn-workspace cache miss
         yarn install --frozen-lockfile
         mkdir -p prebuiltHermes
-        cp -f ../react-native-lab/react-native/sdks/.hermesversion prebuiltHermes/
-        ./gradlew :ReactAndroid:hermes-engine:assembleRelease
-        ./gradlew :ReactAndroid:hermes-engine:assembleDebug
-        cp -f ../react-native-lab/react-native/ReactAndroid/hermes-engine/build/outputs/aar/hermes-engine-release.aar prebuiltHermes/
-        cp -f ../react-native-lab/react-native/ReactAndroid/hermes-engine/build/outputs/aar/hermes-engine-debug.aar prebuiltHermes/
+        cp -f ../react-native-lab/react-native/packages/react-native/sdks/.hermesversion prebuiltHermes/
+        ./gradlew :packages:react-native:ReactAndroid:hermes-engine:assembleRelease
+        ./gradlew :packages:react-native:ReactAndroid:hermes-engine:assembleDebug
+        cp -f ../react-native-lab/react-native/packages/react-native/ReactAndroid/hermes-engine/build/outputs/aar/hermes-engine-release.aar prebuiltHermes/
+        cp -f ../react-native-lab/react-native/packages/react-native/ReactAndroid/hermes-engine/build/outputs/aar/hermes-engine-debug.aar prebuiltHermes/
       env:
         # Reset reactNativeArchitectures to build all architectures
         ORG_GRADLE_PROJECT_reactNativeArchitectures:

diff --git a/.github/workflows/android-instrumentation-tests.yml b/.github/workflows/android-instrumentation-tests.yml
@@ -35,7 +35,7 @@ concurrency:
 jobs:
   test:
     runs-on: macos-12
-    timeout-minutes: 120
+    timeout-minutes: 150
     env:
       ORG_GRADLE_PROJECT_reactNativeArchitectures: x86_64
       GRADLE_OPTS: -Dorg.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=1024m

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -40,9 +40,9 @@ jobs:
       - name: 🧶 Install node modules in root dir
         if: steps.expo-caches.outputs.yarn-workspace-hit != 'true'
         run: yarn install --frozen-lockfile
-      - name: 🔎 Type Check CLI
-        run: yarn typecheck
-        working-directory: packages/@expo/cli
+      # - name: 🔎 Type Check CLI
+      #   run: yarn typecheck
+      #   working-directory: packages/@expo/cli
       - name: 🛠 Build CLI
         run: yarn prepare
         working-directory: packages/@expo/cli

diff --git a/.gitignore b/.gitignore
@@ -65,6 +65,7 @@ xcuserdata
 ReactAndroid-temp.aar
 /android/prebuiltHermes
 /android/versioned-abis/**/*.aar
+/android/packages/react-native/sdks/hermes
 
 # Tools
 jarjar-rules.txt

diff --git a/android/build.gradle b/android/build.gradle
@@ -42,7 +42,7 @@ plugins {
 // WHEN_DISTRIBUTING_REMOVE_TO_HERE
 
 def reactProperties = new Properties()
-file("${project(':ReactAndroid').projectDir}/gradle.properties").withInputStream { reactProperties.load(it) }
+file("${project(':packages:react-native:ReactAndroid').projectDir}/gradle.properties").withInputStream { reactProperties.load(it) }
 
 allprojects {
   repositories {
@@ -91,13 +91,13 @@ allprojects {
     // WHEN_DISTRIBUTING_REMOVE_FROM_HERE
     resolutionStrategy.dependencySubstitution {
       substitute(module("com.facebook.react:react-native"))
-        .using(project(":ReactAndroid"))
+        .using(project(":packages:react-native:ReactAndroid"))
         .because("Building React Native from source")
       substitute(module("com.facebook.react:react-native:+"))
-        .using(project(":ReactAndroid"))
+        .using(project(":packages:react-native:ReactAndroid"))
         .because("Building React Native from source")
       substitute(module("com.facebook.react:react-android"))
-        .using(project(":ReactAndroid"))
+        .using(project(":packages:react-native:ReactAndroid"))
         .because("Building React Native from source")
     }
     // WHEN_DISTRIBUTING_REMOVE_TO_HERE

diff --git a/android/expoview/build.gradle b/android/expoview/build.gradle
@@ -6,27 +6,19 @@ apply plugin: 'kotlin-kapt'
 apply from: new File(rootDir, "versioning_linking.gradle")
 
 def reactProperties = new Properties()
-file("${project(':ReactAndroid').projectDir}/gradle.properties").withInputStream { reactProperties.load(it) }
+file("${project(':packages:react-native:ReactAndroid').projectDir}/gradle.properties").withInputStream { reactProperties.load(it) }
 
 // WHEN_VERSIONING_REMOVE_FROM_HERE
 //maven repository info
 group = 'host.exp.exponent'
 version = '45.0.0'
 
-// Creating sources with comments
-task androidSourcesJar(type: Jar) {
-  classifier = 'sources'
-  from android.sourceSets.main.java.srcDirs
-}
-
 afterEvaluate {
   publishing {
     publications {
       // use `versionedRelease` configuration when publishing to maven
       versionedRelease(MavenPublication) {
         from components.versionedRelease
-        // Add additional sourcesJar to artifacts
-        artifact(androidSourcesJar)
       }
     }
     repositories {
@@ -40,7 +32,7 @@ afterEvaluate {
 
 def prebuiltHermesDir = findProperty("expo.prebuiltHermesDir") ?: file("${rootDir}/prebuiltHermes")
 def prebuiltHermesVersion = file("${prebuiltHermesDir}/.hermesversion").exists() ? file("${prebuiltHermesDir}/.hermesversion").text : null
-def currentHermesVersion = file("${project(':ReactAndroid').projectDir}/../sdks/.hermesversion").exists() ? file("${project(':ReactAndroid').projectDir}/../sdks/.hermesversion").text : null
+def currentHermesVersion = file("${project(':packages:react-native:ReactAndroid').projectDir}/../sdks/.hermesversion").exists() ? file("${project(':packages:react-native:ReactAndroid').projectDir}/../sdks/.hermesversion").text : null
 def buildHermesSource = currentHermesVersion != prebuiltHermesVersion
 logger.info(":expoview - buildHermesSource[${buildHermesSource}]")
 
@@ -132,6 +124,12 @@ android {
 
   // use `versionedRelease` configuration when publishing to maven
   defaultPublishConfig "versionedRelease"
+
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 // WHEN_VERSIONING_REMOVE_FROM_HERE
@@ -190,13 +188,13 @@ dependencies {
 
   api 'org.webkit:android-jsc:r250231' // needs to be before react-native
 
-  api project(':ReactAndroid')
+  api project(':packages:react-native:ReactAndroid')
 
   if (!buildHermesSource) {
     debugImplementation(files("${prebuiltHermesDir}/hermes-engine-debug.aar"))
     releaseImplementation(files("${prebuiltHermesDir}/hermes-engine-release.aar"))
   } else {
-    implementation(project(':ReactAndroid:hermes-engine')) {
+    implementation(project(':packages:react-native:ReactAndroid:hermes-engine')) {
       exclude(group:'com.facebook.fbjni', module: 'fbjni')
     }
   }

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -16,10 +16,10 @@ includeBuild('../react-native-lab/react-native/packages/react-native-gradle-plug
 
 include ':expoview'
 include ':tools'
-include ':ReactAndroid'
-project(':ReactAndroid').projectDir = new File(rootDir, '../react-native-lab/react-native/ReactAndroid')
-include ':ReactAndroid:hermes-engine'
-project(':ReactAndroid:hermes-engine').projectDir = new File(rootDir, '../react-native-lab/react-native/ReactAndroid/hermes-engine')
+include ':packages:react-native:ReactAndroid'
+project(':packages:react-native:ReactAndroid').projectDir = new File(rootDir, '../react-native-lab/react-native/packages/react-native/ReactAndroid')
+include ':packages:react-native:ReactAndroid:hermes-engine'
+project(':packages:react-native:ReactAndroid:hermes-engine').projectDir = new File(rootDir, '../react-native-lab/react-native/packages/react-native/ReactAndroid/hermes-engine')
 include ':expo-modules-test-core'
 project(':expo-modules-test-core').projectDir = new File(rootDir, '../packages/expo-modules-test-core/android')
 

diff --git a/android/tools/src/main/java/host/exp/exponent/tools/ReactAndroidCodeTransformer.java b/android/tools/src/main/java/host/exp/exponent/tools/ReactAndroidCodeTransformer.java
@@ -45,7 +45,7 @@
 
 public class ReactAndroidCodeTransformer {
 
-  private static final String REACT_ANDROID_DEST_ROOT = "react-native-lab/react-native/ReactAndroid";
+  private static final String REACT_ANDROID_DEST_ROOT = "react-native-lab/react-native/packages/react-native/ReactAndroid";
   private static final String SOURCE_PATH = "src/main/java/com/facebook/react/";
 
   private static abstract class MethodVisitor {

diff --git a/android/vendored/sdk47/@shopify/react-native-skia/android/build.gradle b/android/vendored/sdk47/@shopify/react-native-skia/android/build.gradle
@@ -65,9 +65,9 @@ tasks.all({ task ->
 if (rootProject.ext.has('reactNativeAndroidRoot')) {
   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
   androidSourcesDir = defaultDir.parentFile.toString()
-} else if (findProject(':ReactAndroid') != null) {
+} else if (findProject(':packages:react-native:ReactAndroid') != null) {
     sourceBuild = false
-    defaultDir = project(':ReactAndroid').projectDir
+    defaultDir = project(':packages:react-native:ReactAndroid').projectDir
     androidSourcesDir = defaultDir.parentFile.toString()
 } else {
   defaultDir = file("$nodeModules/versioned-react-native/android")
@@ -81,7 +81,7 @@ if (!defaultDir.exists()) {
 }
 
 def prebuiltDir = sourceBuild
-    ? Paths.get(findProject(":ReactAndroid").getProjectDir().toString(), "build", "intermediates", "library_*", "*", "jni")
+    ? Paths.get(findProject(":packages:react-native:ReactAndroid").getProjectDir().toString(), "build", "intermediates", "library_*", "*", "jni")
     : "$buildDir/reactandroid-abi*/jni"
 
 
@@ -208,27 +208,6 @@ dependencies {
     }
 }
 
-afterEvaluate { project ->
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
-
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-    }
-}
-
 task extractAARHeaders {
     doLast {
         configurations.extractHeaders.files.each {
@@ -275,10 +254,10 @@ tasks.whenTaskAdded { task ->
   if (!task.name.contains("Clean") && (task.name.contains('externalNativeBuild') || task.name.startsWith('configureCMake'))) {
     if (sourceBuild) {
       def currentBuildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
-      task.dependsOn(":ReactAndroid:copy${currentBuildType}JniLibsProjectOnly")
+      task.dependsOn(":packages:react-native:ReactAndroid:copy${currentBuildType}JniLibsProjectOnly")
     }
   } else if (task.name.startsWith('generateJsonModel') && sourceBuild) {
     def currentBuildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
-    task.dependsOn(":ReactAndroid:copy${currentBuildType}JniLibsProjectOnly")
+    task.dependsOn(":packages:react-native:ReactAndroid:copy${currentBuildType}JniLibsProjectOnly")
   }
 }
diff --git a/android/vendored/sdk47/react-native-gesture-handler/android/build.gradle b/android/vendored/sdk47/react-native-gesture-handler/android/build.gradle
@@ -201,7 +201,7 @@ def kotlin_version = safeExtGet('kotlinVersion', project.properties['RNGH_kotlin
 dependencies {
     //noinspection GradleDynamicVersion
     if (isNewArchitectureEnabled()) {
-        implementation project(':ReactAndroid')
+        implementation project(':packages:react-native:ReactAndroid')
     } else {
         implementation 'host.exp:reactandroid-abi47_0_0:1.0.0'
     compileOnly 'com.facebook.fbjni:fbjni:+'

diff --git a/android/vendored/sdk47/react-native-reanimated/android/build.gradle b/android/vendored/sdk47/react-native-reanimated/android/build.gradle
@@ -185,7 +185,7 @@ if (CLIENT_SIDE_BUILD) {
 def reactNativeRootDir = Paths.get(projectDir.getPath(), '../../../../versioned-react-native').toFile()
 
 def reactProperties = new Properties()
-file("$reactNativeRootDir/../../react-native-lab/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
+file("$reactNativeRootDir/../../react-native-lab/react-native/packages/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 
 def BOOST_VERSION = reactProperties.getProperty("BOOST_VERSION")
 def DOUBLE_CONVERSION_VERSION = reactProperties.getProperty("DOUBLE_CONVERSION_VERSION")
@@ -614,7 +614,7 @@ Task resolveFolly = resolveTaskFactory("resolveFolly", "folly-${FOLLY_VERSION}.t
 Task resolveGlog = resolveTaskFactory("resolveGlog", "glog-${GLOG_VERSION}.tar.gz", reactNativeAndroidDownloadDir, downloadsDir)
 
 if (isNewArchitectureEnabled()) {
-    def reactNativeAndroidProject = findProject(":ReactAndroid")
+    def reactNativeAndroidProject = findProject(":packages:react-native:ReactAndroid")
     if (reactNativeAndroidProject != null) {
         reactNativeAndroidProject.afterEvaluate {
             def resolveTasks = [resolveBoost, resolveGlog, resolveDoubleConversion, resolveFolly]
@@ -624,13 +624,13 @@ if (isNewArchitectureEnabled()) {
                 if (reactAndroidDownloadTask != null) {
                     task.dependsOn(reactAndroidDownloadTask)
                 } else {
-                    logger.warn("[Reanimated] Failed to find task named `$reactAndroidDownloadTaskName` in `:ReactAndroid` project." +
+                    logger.warn("[Reanimated] Failed to find task named `$reactAndroidDownloadTaskName` in `:packages:react-native:ReactAndroid` project." +
                             " Explicit dependency between it and $task.name task can not be set.")
                 }
             })
         }
     } else {
-        throw new GradleScriptException("[Reanimated] Failed to find `:ReactAndroid` project. Explicit dependency between download tasks can not be set.")
+        throw new GradleScriptException("[Reanimated] Failed to find `:packages:react-native:ReactAndroid` project. Explicit dependency between download tasks can not be set.")
     }
 }
 
@@ -1026,7 +1026,7 @@ if (CLIENT_SIDE_BUILD) {
 tasks.whenTaskAdded { task ->
   def buildType = task.name.endsWith('Debug') ? 'Debug' : 'Release'
   if (!task.name.contains("Clean") && (task.name.contains('externalNativeBuild') || task.name.startsWith('configureCMake') || task.name.startsWith('buildCMake') || task.name.startsWith('generateJsonModel'))) {
-    task.dependsOn(":ReactAndroid:copy${buildType}JniLibsProjectOnly")
+    task.dependsOn(":packages:react-native:ReactAndroid:copy${buildType}JniLibsProjectOnly")
   }
 }
 

diff --git a/android/vendored/sdk47/react-native-screens/android/build.gradle b/android/vendored/sdk47/react-native-screens/android/build.gradle
@@ -104,7 +104,7 @@ repositories {
 
 dependencies {
     if (isNewArchitectureEnabled()) {
-        implementation project(":ReactAndroid")
+        implementation project(":packages:react-native:ReactAndroid")
     } else {
         implementation 'host.exp:reactandroid-abi47_0_0:1.0.0'
     compileOnly 'com.facebook.fbjni:fbjni:+'

diff --git a/android/vendored/sdk48/@shopify/react-native-skia/android/build.gradle b/android/vendored/sdk48/@shopify/react-native-skia/android/build.gradle
@@ -51,9 +51,9 @@ def defaultDir
 
 if (rootProject.ext.has('reactNativeAndroidRoot')) {
   defaultDir = rootProject.ext.get('reactNativeAndroidRoot')
-} else if (findProject(':ReactAndroid') != null) {
+} else if (findProject(':packages:react-native:ReactAndroid') != null) {
     sourceBuild = false
-    defaultDir = project(':ReactAndroid').projectDir
+    defaultDir = project(':packages:react-native:ReactAndroid').projectDir
 } else {
   defaultDir = file("$nodeModules/react-native")
 }
@@ -220,27 +220,6 @@ dependencies {
     }
 }
 
-afterEvaluate { project ->
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
-    }
-
-    android.libraryVariants.all { variant ->
-        def name = variant.name.capitalize()
-        def javaCompileTask = variant.javaCompileProvider.get()
-
-        task "jar${name}"(type: Jar, dependsOn: javaCompileTask) {
-            from javaCompileTask.destinationDir
-        }
-    }
-
-    artifacts {
-        archives androidSourcesJar
-    }
-}
-
 task extractAARHeaders {
     doLast {
         configurations.extractHeaders.files.each {

diff --git a/android/vendored/sdk48/react-native-reanimated/android/build.gradle b/android/vendored/sdk48/react-native-reanimated/android/build.gradle
@@ -203,7 +203,7 @@ if (CLIENT_SIDE_BUILD) {
 def reactNativeRootDir = Paths.get(projectDir.getPath(), '../../../../versioned-react-native').toFile()
 
 def reactProperties = new Properties()
-file("$rootDir/../react-native-lab/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
+file("$rootDir/../react-native-lab/react-native/packages/react-native/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 
 def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
 def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
@@ -734,7 +734,7 @@ if (REACT_NATIVE_MINOR_VERSION < 71) {
     Task resolveGlog = resolveTaskFactory("resolveGlog", "glog-${GLOG_VERSION}.tar.gz", reactNativeAndroidDownloadDir, downloadsDir)
 
     if (isNewArchitectureEnabled()) {
-        def reactNativeAndroidProject = findProject(":ReactAndroid")
+        def reactNativeAndroidProject = findProject(":packages:react-native:ReactAndroid")
         if (reactNativeAndroidProject != null) {
             reactNativeAndroidProject.afterEvaluate {
                 def resolveTasks = [resolveBoost, resolveGlog, resolveDoubleConversion, resolveFolly]
@@ -744,13 +744,13 @@ if (REACT_NATIVE_MINOR_VERSION < 71) {
                     if (reactAndroidDownloadTask != null) {
                         task.dependsOn(reactAndroidDownloadTask)
                     } else {
-                        logger.warn("[Reanimated] Failed to find task named `$reactAndroidDownloadTaskName` in `:ReactAndroid` project." +
+                        logger.warn("[Reanimated] Failed to find task named `$reactAndroidDownloadTaskName` in `:packages:react-native:ReactAndroid` project." +
                                 " Explicit dependency between it and $task.name task can not be set.")
                     }
                 })
             }
         } else {
-            throw new GradleException("[Reanimated] Failed to find `:ReactAndroid` project. Explicit dependency between download tasks can not be set.")
+            throw new GradleException("[Reanimated] Failed to find `:packages:react-native:ReactAndroid` project. Explicit dependency between download tasks can not be set.")
         }
     }
 

diff --git a/android/vendored/sdk48/react-native-svg/android/build.gradle b/android/vendored/sdk48/react-native-svg/android/build.gradle
@@ -87,7 +87,7 @@ repositories {
 
 dependencies {
     if (isNewArchitectureEnabled()) {
-        implementation project(":ReactAndroid")
+        implementation project(":packages:react-native:ReactAndroid")
     } else {
         implementation 'host.exp:reactandroid-abi48_0_0:1.0.0'
     compileOnly 'com.facebook.fresco:fresco:+'