[pull] main from expo:main

apps/bare-expo/ios/AppDelegate.swift

@@ -1,10 +1,10 @@
-import Expo
+internal import Expo
 import Network
 import React
 import ReactAppDependencyProvider
 
 @main
-public class AppDelegate: ExpoAppDelegate {
+class AppDelegate: ExpoAppDelegate {
   var window: UIWindow?
 
   var reactNativeDelegate: ExpoReactNativeFactoryDelegate?

apps/bare-expo/ios/Podfile.lock

@@ -375,6 +375,7 @@ PODS:
     - ExpoModulesCore
   - ExpoGL (55.0.3):
     - ExpoModulesCore
+    - ExpoModulesJSI
     - ReactCommon/turbomodule/core
   - ExpoGlassEffect (55.0.3):
     - ExpoModulesCore
@@ -3806,7 +3807,7 @@ SPEC CHECKSUMS:
   ExpoDomWebView: 2cb9e9bed46799fa8f36b6284ce7799f1dbff297
   ExpoFileSystem: fbc1b6c573adea694db76bcfdec603952d96b0d5
   ExpoFont: 4e2967170d6ee7316c5efd62dd06aabd7b4593d2
-  ExpoGL: 995034ac1bf272589a7f0670dddf6c646c3842af
+  ExpoGL: 5c4ead68e3ccad2ff5d71a9afe6b332af5da6233
   ExpoGlassEffect: 3f4ba89f21a3077d598777608808c5bde0d7de43
   ExpoHaptics: f919ee984bb7617ddb9819856dd662b2f4248f71
   ExpoImage: eb2443489a4e380def23857653e170054ecec49c

apps/bare-expo/macos/BareExpo-macOS/AppDelegate.swift

@@ -1,9 +1,9 @@
-import Expo
+internal import Expo
 import React
 import ReactAppDependencyProvider
 
 @main
-public class AppDelegate: ExpoAppDelegate {
+class AppDelegate: ExpoAppDelegate {
   var window: UIWindow?
 
   var reactNativeDelegate: ExpoReactNativeFactoryDelegate?

apps/brownfield-tester/ios/BrownfieldTester/ExpoViewController.swift

@@ -1,48 +1,48 @@
-import Expo
+internal import Expo
 import React
 import ReactAppDependencyProvider
 
 class ExpoViewController: UIViewController {
   private var moduleName: String
   private var initialProperties: [String: Any]?
-  
+
   var reactNativeDelegate: ExpoReactNativeFactoryDelegate?
   var reactNativeFactory: RCTReactNativeFactory?
-  
+
   @objc public init(moduleName: String, initialProperties: [String: Any]? = nil) {
     self.moduleName = moduleName
     self.initialProperties = initialProperties
     super.init(nibName: nil, bundle: nil)
   }
-  
+
   required init?(coder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
-  
+
   override func viewDidLoad() {
     super.viewDidLoad()
-    
+
     let delegate = ReactNativeDelegate()
     let factory = ExpoReactNativeFactory(delegate: delegate)
-    
+
     delegate.dependencyProvider = RCTAppDependencyProvider()
-    
+
     reactNativeDelegate = delegate
     reactNativeFactory = factory
-    
+
     view =  factory.rootViewFactory.view(withModuleName: moduleName)
     delegate.setRootView(view, toRootViewController: self)
   }
 }
 
 class ReactNativeDelegate: ExpoReactNativeFactoryDelegate {
   // Extension point for config-plugins
-  
+
   override func sourceURL(for bridge: RCTBridge) -> URL? {
     // needed to return the correct URL for expo-dev-client.
     bridge.bundleURL ?? bundleURL()
   }
-  
+
   override func bundleURL() -> URL? {
 #if DEBUG
     return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: ".expo/.virtual-metro-entry")

apps/minimal-tester/ios/Podfile

@@ -1,4 +1,3 @@
-require File.join(File.dirname(`node --print "require.resolve('expo-brownfield/package.json')"`), "plugin/src/ios/scripts/reorder_build_phases.rb")
 require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
 require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")