[pull] main from expo:main

apps/bare-expo/ios/Podfile.lock

@@ -38,11 +38,6 @@ PODS:
   - EXManifests/Tests (1.0.8):
     - ExpoModulesCore
     - ExpoModulesTestCore
-  - EXNotifications (0.32.11):
-    - ExpoModulesCore
-  - EXNotifications/Tests (0.32.11):
-    - ExpoModulesCore
-    - ExpoModulesTestCore
   - Expo (54.0.8):
     - ExpoModulesCore
     - hermes-engine
@@ -520,6 +515,11 @@ PODS:
     - React-hermes
   - ExpoNetwork (8.0.7):
     - ExpoModulesCore
+  - ExpoNotifications (0.32.11):
+    - ExpoModulesCore
+  - ExpoNotifications/Tests (0.32.11):
+    - ExpoModulesCore
+    - ExpoModulesTestCore
   - ExpoPrint (15.0.7):
     - ExpoModulesCore
   - ExpoRouter (6.0.6):
@@ -3111,8 +3111,6 @@ DEPENDENCIES:
   - EXJSONUtils/Tests (from `../../../packages/expo-json-utils/ios`)
   - EXManifests (from `../../../packages/expo-manifests/ios`)
   - EXManifests/Tests (from `../../../packages/expo-manifests/ios`)
-  - EXNotifications (from `../../../packages/expo-notifications/ios`)
-  - EXNotifications/Tests (from `../../../packages/expo-notifications/ios`)
   - Expo (from `../../../packages/expo`)
   - expo-dev-client (from `../../../packages/expo-dev-client/ios`)
   - expo-dev-launcher (from `../../../packages/expo-dev-launcher`)
@@ -3172,6 +3170,8 @@ DEPENDENCIES:
   - ExpoModulesJSI/Tests (from `../../../packages/expo-modules-core`)
   - ExpoModulesTestCore (from `../../../packages/expo-modules-test-core/ios`)
   - ExpoNetwork (from `../../../packages/expo-network/ios`)
+  - ExpoNotifications (from `../../../packages/expo-notifications/ios`)
+  - ExpoNotifications/Tests (from `../../../packages/expo-notifications/ios`)
   - ExpoPrint (from `../../../packages/expo-print/ios`)
   - ExpoRouter (from `../../../packages/expo-router/ios`)
   - ExpoScreenCapture (from `../../../packages/expo-screen-capture/ios`)
@@ -3327,9 +3327,6 @@ EXTERNAL SOURCES:
   EXManifests:
     inhibit_warnings: false
     :path: "../../../packages/expo-manifests/ios"
-  EXNotifications:
-    inhibit_warnings: false
-    :path: "../../../packages/expo-notifications/ios"
   Expo:
     inhibit_warnings: false
     :path: "../../../packages/expo"
@@ -3478,6 +3475,9 @@ EXTERNAL SOURCES:
   ExpoNetwork:
     inhibit_warnings: false
     :path: "../../../packages/expo-network/ios"
+  ExpoNotifications:
+    inhibit_warnings: false
+    :path: "../../../packages/expo-notifications/ios"
   ExpoPrint:
     inhibit_warnings: false
     :path: "../../../packages/expo-print/ios"
@@ -3743,7 +3743,6 @@ SPEC CHECKSUMS:
   EXConstants: 59d46d25b89f88cc38291a56dbce4d550758f72d
   EXJSONUtils: 1d3e4590438c3ee593684186007028a14b3686cd
   EXManifests: 7469efed75d694ce3c43a6da9c6f3886f66d3c26
-  EXNotifications: a9eb811deeb51fb8e50ef45569be6ffab3994648
   Expo: 9d61298dd8bbd625b62dcd082485fe1692084242
   expo-dev-client: b8c16c699a35787e1ac38c6d44ef7552fe3f0334
   expo-dev-launcher: 93ab1128548f72825f3fe290ff1c1690114e8def
@@ -3794,6 +3793,7 @@ SPEC CHECKSUMS:
   ExpoModulesJSI: c470ea2ed825fce73bdc4ef060c8a22e3f664092
   ExpoModulesTestCore: e65555b75a4ed7dd3bcf421ad01d7748bd372c88
   ExpoNetwork: 97073786edfe405aba5d0987a544617ed0671ad1
+  ExpoNotifications: ce045fa5f6ab4109f04468e04e6fe6ff0427a6d1
   ExpoPrint: ad836bb90da10793509651c0ea1f39e120db001e
   ExpoRouter: 84268c2b41722697cb02cd6c377d588b4f71c9b5
   ExpoScreenCapture: 0c785ab7e1fa38943f04b16060d54ae8f886544a

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

@@ -131,10 +131,10 @@ class ExponentPackage : ReactPackage {
         nativeModules.add(NetInfoModule(reactContext))
         nativeModules.add(EdgeToEdgeModule(reactContext))
         nativeModules.add(KeyboardControllerModule(reactContext))
-        nativeModules.addAll(SvgPackage().getReactModuleInfoProvider().getReactModuleInfos().map { SvgPackage().getModule(it.value.name, reactContext)!! })
-        nativeModules.addAll(MapsPackage().getReactModuleInfoProvider().getReactModuleInfos().map { MapsPackage().getModule(it.value.name, reactContext)!! })
-        nativeModules.addAll(RNDateTimePickerPackage().getReactModuleInfoProvider().getReactModuleInfos().map { RNDateTimePickerPackage().getModule(it.value.name, reactContext)!! })
-        nativeModules.addAll(stripePackage.getReactModuleInfoProvider().getReactModuleInfos().map { stripePackage.getModule(it.value.name, reactContext)!! })
+        nativeModules.addAll(svgPackage.getReactModuleInfoProvider().getReactModuleInfos().values.mapNotNull { svgPackage.getModule(it.name, reactContext) })
+        nativeModules.addAll(mapsPackage.getReactModuleInfoProvider().getReactModuleInfos().values.mapNotNull { mapsPackage.getModule(it.name, reactContext) })
+        nativeModules.addAll(dateTimePackage.getReactModuleInfoProvider().getReactModuleInfos().values.mapNotNull { dateTimePackage.getModule(it.name, reactContext) })
+        nativeModules.addAll(stripePackage.getReactModuleInfoProvider().getReactModuleInfos().values.mapNotNull { stripePackage.getModule(it.name, reactContext) })
         nativeModules.addAll(skiaPackage.createNativeModules(reactContext))
 
         // Call to create native modules has to be at the bottom --
@@ -214,6 +214,9 @@ class ExponentPackage : ReactPackage {
     // Need to avoid initializing duplicated packages
     private val stripePackage = StripeSdkPackage()
     private val skiaPackage = RNSkiaPackage()
+    private val mapsPackage = MapsPackage()
+    private val dateTimePackage = RNDateTimePickerPackage()
+    private val svgPackage = SvgPackage()
 
     fun kernelExponentPackage(
       context: Context,

apps/expo-go/ios/Client/SwiftUI/Account/AccountSheet.swift

@@ -45,8 +45,7 @@ struct AccountSheet: View {
 
         Button {
           dismiss()
-        }
-        label: {
+        } label: {
           Image(systemName: "xmark")
             .font(.system(size: 16, weight: .medium))
             .foregroundColor(.primary)
@@ -79,17 +78,16 @@ struct AccountSheet: View {
     Button {
       UIImpactFeedbackGenerator(style: .light).impactOccurred()
       viewModel.signOut()
-    }
-    label: {
+    } label: {
       Text("Logout")
-          .font(.headline)
-          .fontWeight(.bold)
-          .foregroundColor(.white)
-          .frame(maxWidth: .infinity)
-          .padding(.vertical, 12)
-      }
-      .background(Color.black)
-      .cornerRadius(12)
+        .font(.headline)
+        .fontWeight(.bold)
+        .foregroundColor(.white)
+        .frame(maxWidth: .infinity)
+        .padding(.vertical, 12)
+    }
+    .background(Color.black)
+    .cornerRadius(12)
     }
   }
 
@@ -117,8 +115,7 @@ struct AccountSheet: View {
       Task {
         await viewModel.signIn()
       }
-    }
-    label: {
+    } label: {
       Text("Log In")
         .font(.headline)
         .fontWeight(.semibold)
@@ -137,16 +134,15 @@ struct AccountSheet: View {
       Task {
         await viewModel.signUp()
       }
-    }
-    label: {
+    } label: {
       Text("Sign Up")
         .font(.headline)
         .fontWeight(.semibold)
         .foregroundColor(.black.opacity(0.7))
         .frame(maxWidth: .infinity)
         .padding(.vertical, 12)
     }
-    .background(Color(.white))
+    .background(Color.white)
     .cornerRadius(12)
     .disabled(viewModel.isAuthenticating)
   }
@@ -155,8 +151,7 @@ struct AccountSheet: View {
     Button {
       UIImpactFeedbackGenerator(style: .light).impactOccurred()
       viewModel.selectAccount(accountId: account.id)
-    }
-    label: {
+    } label: {
       HStack(spacing: 12) {
         AvatarView(account: account, size: 40)