[pull] main from expo:main

apps/expo-go/.gitignore

@@ -6,8 +6,6 @@
 /android/**/local.properties
 /android/captures
 /android/expoview/libs/ReactAndroid-temp
-/android/versioned-react-native/packages
-/android/versioned-react-native/ReactAndroid
 ReactAndroid-temp.aar
 /android/prebuiltHermes
 /android/versioned-abis/**/*.aar

apps/expo-go/android/app/build.gradle

@@ -230,36 +230,9 @@ dependencies {
   implementation 'androidx.core:core-splashscreen:1.0.1'
 
   // Our dependencies from ExpoView
-  // DON'T ADD ANYTHING HERE THAT ISN'T IN EXPOVIEW. ONLY COPY THINGS FROM EXPOVIEW TO HERE.
   compileOnly 'org.glassfish:javax.annotation:3.1.1'
-  implementation 'com.jakewharton:butterknife:10.2.1'
-  implementation 'de.greenrobot:eventbus:2.4.0'
-
-  implementation 'com.squareup.picasso:picasso:2.5.2'
-  implementation 'com.google.android.gms:play-services-analytics:16.0.1'
-  implementation 'com.google.android.gms:play-services-maps:18.0.0'
-  implementation 'com.google.android.gms:play-services-auth:15.0.1'
-  implementation 'com.google.android.gms:play-services-location:15.0.1'
-  debugImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
-  // debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.4-beta1'
-  releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
-  implementation 'com.facebook.device.yearclass:yearclass:2.1.0'
-  implementation 'commons-io:commons-io:1.4'
-  implementation 'com.airbnb.android:lottie:6.5.2'
-  implementation 'me.leolin:ShortcutBadger:1.1.4@aar'
-  implementation 'com.vanniktech:android-image-cropper:4.6.0'
-  implementation 'commons-codec:commons-codec:1.10'
-  implementation 'com.google.zxing:core:3.3.3'
-  implementation 'net.openid:appauth:0.4.1'
-  implementation "androidx.exifinterface:exifinterface:1.3.3"
-  implementation 'com.squareup.okio:okio:1.9.0'
-  implementation 'com.facebook.soloader:soloader:0.12.1'
   implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
-  // expo-file-system
-  implementation 'com.squareup.okhttp3:okhttp:3.10.0'
-  implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
-
   // Testing
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
   androidTestImplementation 'androidx.test:runner:1.4.0'

apps/expo-go/android/expoview/build.gradle

@@ -24,7 +24,6 @@ plugins {
   id 'expo-module-gradle-plugin'
 }
 apply plugin: 'com.google.devtools.ksp'
-apply from: new File(rootDir, "versioning_linking.gradle")
 apply plugin: 'com.apollographql.apollo'
 
 expoModule {
@@ -34,12 +33,6 @@ expoModule {
 def reactProperties = new Properties()
 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'
-// WHEN_VERSIONING_REMOVE_TO_HERE
-
 repositories {
   mavenCentral()
   maven { url "https://jitpack.io" }
@@ -90,19 +83,13 @@ android {
     versionCode 1
     versionName "1.0"
 
-    /* WHEN_VERSIONING_UNCOMMENT_FROM_HERE
-    missingDimensionStrategy('versioning', 'versioned')
-    WHEN_VERSIONING_UNCOMMENT_TO_HERE */
-
-    // WHEN_VERSIONING_REMOVE_FROM_HERE
     manifestPlaceholders = [
       'appAuthRedirectScheme': 'host.exp.exponent'
     ]
 
     buildConfigField("boolean", "IS_INTERNAL_BUILD", "false")
     buildConfigField("int", "EXOPACKAGE_FLAGS", "0")
     buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true")
-    // WHEN_VERSIONING_REMOVE_TO_HERE
   }
 
   buildTypes {
@@ -124,7 +111,6 @@ apollo {
   }
 }
 
-// WHEN_VERSIONING_REMOVE_FROM_HERE
 import org.apache.tools.ant.taskdefs.condition.Os
 
 class GenerateDynamicMacrosPlugin implements Plugin<Project> {
@@ -152,8 +138,6 @@ class GenerateDynamicMacrosPlugin implements Plugin<Project> {
 
 apply plugin: GenerateDynamicMacrosPlugin
 
-// WHEN_VERSIONING_REMOVE_TO_HERE
-
 dependencies {
   api fileTree(dir: 'libs', include: ['*.jar'])
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
@@ -165,23 +149,17 @@ dependencies {
   implementation 'io.coil-kt.coil3:coil-network-okhttp:3.2.0'
   implementation 'androidx.compose.material3:material3:1.4.0-alpha10'
   implementation 'androidx.core:core-splashscreen:1.0.1'
-  implementation 'io.coil-kt:coil-compose:2.6.0'
   implementation "androidx.navigation:navigation-compose:2.8.5"
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0"
   implementation "androidx.compose.ui:ui:1.7.6"
   implementation "androidx.compose.runtime:runtime-saveable:1.7.6"
-  implementation "androidx.compose.material3:material3:1.3.1"
   implementation "androidx.compose.animation:animation:1.7.6"
   implementation "androidx.compose.foundation:foundation:1.7.6"
   implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7"
   implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
 
   testImplementation 'junit:junit:4.13.2'
 
-  // WHEN_VERSIONING_REPLACE_WITH_DEPENDENCIES
-
-  // WHEN_VERSIONING_REMOVE_FROM_HERE
-
   api 'org.webkit:android-jsc:r250231' // needs to be before react-native
 
   api project(':packages:react-native:ReactAndroid')
@@ -193,10 +171,6 @@ dependencies {
   // Expo modules
   api project(':expo')
 
-  // Versioned react native
-  // THIS COMMENT IS USED BY android-build-aar.sh DO NOT MODIFY
-  // WHEN_VERSIONING_REMOVE_TO_HERE
-
   // React native dependencies
   api(libs.androidx.appcompat.resources)
   api(libs.androidx.appcompat)
@@ -225,28 +199,16 @@ dependencies {
   api 'de.greenrobot:eventbus:2.4.0'
   api 'com.google.firebase:firebase-crashlytics:19.3.0'
   api 'com.google.firebase:firebase-crashlytics-ndk:19.3.0'
-  api "androidx.room:room-runtime:2.1.0"
   implementation 'com.google.android.material:material:1.3.0'
   implementation 'com.google.code.gson:gson:2.13.2'
 
   api(expoLibs.fresco.animated.gif)
   api(expoLibs.fresco.animated.webp)
   api(expoLibs.fresco.webpsupport)
 
-  api 'com.squareup.picasso:picasso:2.5.2'
-  api 'com.google.android.gms:play-services-analytics:17.0.0'
-  api 'com.google.android.gms:play-services-maps:18.0.1'
-  api 'com.google.android.gms:play-services-auth:17.0.0'
-  api 'com.google.android.gms:play-services-location:20.0.0'
   api 'com.google.android.gms:play-services-fitness:17.0.0'
-  api 'com.google.android.gms:play-services-wallet:17.0.0' //may need 10.+
-  debugApi 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
-  // debugApi 'com.squareup.leakcanary:leakcanary-android:1.4-beta1'
-  releaseApi 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta1'
   api 'commons-io:commons-io:2.6'
   api 'me.leolin:ShortcutBadger:1.1.4@aar'
-  implementation "com.vanniktech:android-image-cropper:4.6.0"
-  api 'commons-codec:commons-codec:1.10'
   api 'net.openid:appauth:0.7.1'
   api 'com.airbnb.android:lottie:6.5.2'
   compileOnly 'io.branch.sdk.android:library:4.1.0'
@@ -255,22 +217,9 @@ dependencies {
   api "androidx.browser:browser:1.0.0"
   implementation "androidx.tracing:tracing-ktx:1.1.0"
 
-  api 'com.google.firebase:firebase-core:21.1.0'
   api 'com.google.firebase:firebase-messaging:22.0.0'
-  api 'com.google.maps.android:android-maps-utils:3.4.0'
-  // Remember to update DetachAppTemplate build.gradle if you add any excludes or transitive = false here!
-
-  // expo-file-system
-  api 'com.squareup.okhttp3:okhttp:3.10.0'
-  api 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
 
-  // expo-application
-  api 'com.android.installreferrer:installreferrer:1.0'
-
-  // expo-blur
-  implementation 'com.github.Dimezis:BlurView:version-2.0.3'
-
-  // expo-camera
+  // Home screen QR scanner (QRScannerActivity, HomeAppViewModel)
   def camerax_version = "1.4.0-alpha02"
   implementation "androidx.camera:camera-core:${camerax_version}"
   implementation "androidx.camera:camera-camera2:${camerax_version}"
@@ -282,7 +231,7 @@ dependencies {
   implementation "com.google.mlkit:barcode-scanning:17.3.0"
   implementation 'androidx.camera:camera-mlkit-vision:1.4.0-alpha02'
 
-  // expo-store-review
+  // In-app review prompt (HomeAppViewModel)
   implementation "com.google.android.play:review:2.0.1"
   implementation "com.google.android.play:review-ktx:2.0.0"
 
@@ -293,17 +242,6 @@ dependencies {
 
   implementation 'com.cronutils:cron-utils:4.1.3'
 
-  // @react-native-community/viewpager
-  api 'com.github.troZee:ViewPager2:v1.0.6'
-
-  // react-native-webview
-  implementation "androidx.webkit:webkit:1.4.0"
-
-  // expo-updates
-  implementation 'org.bouncycastle:bcutil-jdk15to18:1.70'
-
-  // react-native-maps
-  implementation "androidx.work:work-runtime:2.7.1"
 }
 
 project.afterEvaluate {
@@ -320,5 +258,3 @@ project.afterEvaluate {
   // For the workaround, we just pretend we don't have local aar dependencies.
   tasks.findByName("bundleReleaseLocalLintAar")?.localAarDeps?.setFrom([])
 }
-
-useVendoredModulesForExpoView('unversioned')

apps/expo-go/android/expoview/src/main/AndroidManifest.xml

@@ -2,14 +2,12 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- WHEN_VERSIONING_REMOVE_FROM_HERE -->
   <supports-screens
     android:anyDensity="true"
     android:largeScreens="true"
     android:normalScreens="true"
     android:smallScreens="true"
     android:xlargeScreens="true"/>
-  <!-- WHEN_VERSIONING_REMOVE_TO_HERE -->
 
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
@@ -70,7 +68,6 @@
 
   <application android:theme="@style/AppTheme">
 
-    <!-- WHEN_VERSIONING_REMOVE_FROM_HERE -->
     <!-- Scheduled notifications -->
     <receiver
       android:name="host.exp.exponent.notifications.ScheduledNotificationReceiver"
@@ -88,8 +85,6 @@
       </intent-filter>
     </receiver>
 
-    <!-- WHEN_VERSIONING_REMOVE_TO_HERE -->
-
     <provider
       android:name="androidx.core.content.FileProvider"
       android:authorities="${applicationId}.provider"

apps/expo-go/android/expoview/src/main/java/host/exp/exponent/experience/MultipleVersionReactNativeActivity.java

@@ -5,7 +5,6 @@
 // Empty stub in `unversioned` flavor. See src/versioned/... for versioned variant
 // or change android flavor to `versioned`.
 public class MultipleVersionReactNativeActivity extends ReactNativeActivity implements
-    // The 4-space indentation is used by android-build-aar.sh.
     com.facebook.react.modules.core.DefaultHardwareBackBtnHandler {
 
 }

apps/expo-go/android/expoview/src/main/java/host/exp/exponent/home/AccountScreen.kt

@@ -28,7 +28,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import host.exp.exponent.graphql.fragment.CurrentUserActorData
 import host.exp.expoview.R
 

apps/expo-go/android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.kt

@@ -108,9 +108,7 @@ class ExponentPackage : ReactPackage {
     nativeModules.add(if (isVerified) ExponentAsyncStorageModule(reactContext, manifest) else ExponentUnsignedAsyncStorageModule(reactContext))
 
     if (isKernel) {
-      // WHEN_VERSIONING_REMOVE_FROM_HERE
       nativeModules.add((ExponentKernelModuleProvider.newInstance(reactContext) as NativeModule?)!!)
-      // WHEN_VERSIONING_REMOVE_TO_HERE
     }
 
     if (isVerified) {

apps/expo-go/android/settings.gradle

@@ -49,8 +49,6 @@ expoAutolinking.useExpoModules()
 
 include ':app'
 
-apply from: new File(rootDir, "versioning_linking.gradle")
-
 // Linked manually to used version from our RN fork
 includeBuild(new File(rootDir, "../../../react-native-lab/react-native/packages/gradle-plugin").toString())
 
@@ -72,10 +70,3 @@ 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')
-
-[
-    // ADD_NEW_SUPPORTED_ABIS_HERE
-].forEach({ abiVariant ->
-  include ":expoview-$abiVariant"
-  project(":expoview-$abiVariant").projectDir = new File(rootDir, "versioned-abis/expoview-$abiVariant")
-})