From 4ab2fd68a4ebbf18100e34695715138d6e41dbd6 Mon Sep 17 00:00:00 2001 From: aleqsio Date: Mon, 29 May 2023 11:36:49 +0200 Subject: [PATCH] Make expo go work on M1 simulator (#21249) Co-authored-by: Expo Bot <34669131+expo-bot@users.noreply.github.com> --- .../ios/BareExpo.xcodeproj/project.pbxproj | 18 +- apps/bare-expo/ios/Podfile.lock | 20 +- ios/Exponent.xcodeproj/project.pbxproj | 18 +- ios/Podfile | 7 +- ios/Podfile.lock | 216 +++++++++--------- .../ExpoMaps/ABI48_0_0ExpoMaps.podspec.json | 4 +- packages/expo-maps/CHANGELOG.md | 2 + packages/expo-maps/ios/ExpoMaps.podspec | 4 +- 8 files changed, 153 insertions(+), 136 deletions(-) diff --git a/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj b/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj index 4d707e61448d9..b3070ef55f213 100644 --- a/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj +++ b/apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj @@ -455,8 +455,10 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-BareExpoMain-BareExpo/Pods-BareExpoMain-BareExpo-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle", - "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64_x86_64-simulator/GooglePlaces.framework/Resources/GooglePlaces.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/MLKitFaceDetection/GoogleMVFaceDetectorResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-launcher/EXDevLauncher.bundle", @@ -503,8 +505,10 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-BareExpoMain-BareExpoTests/Pods-BareExpoMain-BareExpoTests-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle", - "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64_x86_64-simulator/GooglePlaces.framework/Resources/GooglePlaces.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/MLKitFaceDetection/GoogleMVFaceDetectorResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-launcher/EXDevLauncher.bundle", @@ -611,8 +615,10 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-BareExpoMain-BareExpoDetox/Pods-BareExpoMain-BareExpoDetox-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle", - "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64_x86_64-simulator/GooglePlaces.framework/Resources/GooglePlaces.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/MLKitFaceDetection/GoogleMVFaceDetectorResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-launcher/EXDevLauncher.bundle", diff --git a/apps/bare-expo/ios/Podfile.lock b/apps/bare-expo/ios/Podfile.lock index aa49a5a9367c8..e52839edc5c6b 100644 --- a/apps/bare-expo/ios/Podfile.lock +++ b/apps/bare-expo/ios/Podfile.lock @@ -179,8 +179,8 @@ PODS: - ExpoModulesCore - ExpoMaps (0.0.2): - ExpoModulesCore - - GoogleMaps (= 7.1.0) - - GooglePlaces (= 7.1.0) + - GoogleMaps (= 7.3.0) + - GooglePlaces (= 7.3.0) - ExpoModulesCore (1.3.2): - React-Core - React-RCTAppDelegate @@ -251,17 +251,17 @@ PODS: - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleMaps (7.1.0): - - GoogleMaps/Maps (= 7.1.0) - - GoogleMaps/Base (7.1.0) - - GoogleMaps/Maps (7.1.0): + - GoogleMaps (7.3.0): + - GoogleMaps/Maps (= 7.3.0) + - GoogleMaps/Base (7.3.0) + - GoogleMaps/Maps (7.3.0): - GoogleMaps/Base - GoogleMLKit/FaceDetection (2.6.0): - GoogleMLKit/MLKitCore - MLKitFaceDetection (~> 1.5.0) - GoogleMLKit/MLKitCore (2.6.0): - MLKitCommon (~> 5.0.0) - - GooglePlaces (7.1.0) + - GooglePlaces (7.3.0) - GoogleToolboxForMac/DebugUtils (2.3.2): - GoogleToolboxForMac/Defines (= 2.3.2) - GoogleToolboxForMac/Defines (2.3.2) @@ -1291,7 +1291,7 @@ SPEC CHECKSUMS: ExpoLocalAuthentication: de5f50fae4fa643a3fc6b404d61a2ab36b5acf20 ExpoLocalization: c1201ba5cfcfb187972138e58c07cc708c5399db ExpoMailComposer: b9a4871714550d5b4e26d1873f0572e350c86478 - ExpoMaps: be6983038f20ab7d6c953cda7aa48f81713896d3 + ExpoMaps: 0d442753556c5a2a5f8e15fdb1d833a6768de816 ExpoModulesCore: b7865a95e88b5731893e177bbf82f6a05f3f92d9 ExpoModulesTestCore: 42fce831c9601dcfaba09fe7a03dfe99e25754a4 ExpoNetwork: ef59bebcdbeb6ea188157a8fc88e9ceafbff1f89 @@ -1319,9 +1319,9 @@ SPEC CHECKSUMS: fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleMaps: bc56ffb0324e345a2d91bac1a64a920f9c8f1b20 + GoogleMaps: a146f275ee429d14822178c7a841c03366ec92a1 GoogleMLKit: 755661c46990a85e42278015f26400286d98ad95 - GooglePlaces: 187946335ec3dc624de71c0a9ddcc712f19b0ee1 + GooglePlaces: 0609463845250bbadafa1739938181e54dece439 GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34 GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe diff --git a/ios/Exponent.xcodeproj/project.pbxproj b/ios/Exponent.xcodeproj/project.pbxproj index 8697fd93dcb26..14dcf2c03f010 100644 --- a/ios/Exponent.xcodeproj/project.pbxproj +++ b/ios/Exponent.xcodeproj/project.pbxproj @@ -446,7 +446,6 @@ F1D6AF61244714C100AC1C74 /* EXDevMenuGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = F1D6AF60244714C100AC1C74 /* EXDevMenuGestureRecognizer.m */; }; F1D6AF64244720E100AC1C74 /* EXDevMenuManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F1D6AF63244720E100AC1C74 /* EXDevMenuManager.m */; }; F1F7433E24ABECD500EA5023 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1F7433D24ABECD500EA5023 /* AppDelegate.swift */; }; - F2A146DA1DEC1705926E3D37 /* libPods-Expo Go-Expo Go (unversioned).a in Frameworks */ = {isa = PBXBuildFile; fileRef = D1919BD72DB8244D157FA9EC /* libPods-Expo Go-Expo Go (unversioned).a */; }; F581B81CB601426CB5658AEE /* RNSharedElementCornerRadii.m in Sources */ = {isa = PBXBuildFile; fileRef = 780F0BF062134A048B33344C /* RNSharedElementCornerRadii.m */; settings = {COMPILER_FLAGS = "-w"; }; }; F77DDB931E04AC1100624CA2 /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F77DDB921E04AC1100624CA2 /* SafariServices.framework */; }; FBCC5A97F536402C98688A94 /* RNCPickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 36B3AC83321C444B879BD737 /* RNCPickerManager.m */; settings = {COMPILER_FLAGS = "-w"; }; }; @@ -457,6 +456,7 @@ FCF6D37025B34BC200808BF5 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCF6D36F25B34BC200808BF5 /* NotificationService.swift */; }; FCF6D37425B34BC200808BF5 /* ExpoNotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = FCF6D36D25B34BC200808BF5 /* ExpoNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; FE8D4A1FC2BDC25C8D4684F8 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C849D84FFC04012BBF6DFFD /* ExpoModulesProvider.swift */; }; + FFFE71165667AED5AF475C24 /* libPods-Expo Go-Expo Go (unversioned).a in Frameworks */ = {isa = PBXBuildFile; fileRef = D1919BD72DB8244D157FA9EC /* libPods-Expo Go-Expo Go (unversioned).a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -996,7 +996,7 @@ buildActionMask = 2147483647; files = ( F77DDB931E04AC1100624CA2 /* SafariServices.framework in Frameworks */, - F2A146DA1DEC1705926E3D37 /* libPods-Expo Go-Expo Go (unversioned).a in Frameworks */, + FFFE71165667AED5AF475C24 /* libPods-Expo Go-Expo Go (unversioned).a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2341,7 +2341,8 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Expo Go-Expo Go (versioned)/Pods-Expo Go-Expo Go (versioned)-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/Stripe/Stripe.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/StripeCore/StripeCore.bundle", @@ -2354,7 +2355,8 @@ "${PODS_CONFIGURATION_BUILD_DIR}/ABI46_0_0React-Core/ABI46_0_0AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/ABI47_0_0React-Core/ABI47_0_0AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/ABI48_0_0React-Core/ABI48_0_0AccessibilityResources.bundle", - "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64/GooglePlaces.framework/Resources/GooglePlaces.bundle", + "${PODS_ROOT}/GooglePlaces/Frameworks/GooglePlaces.xcframework/ios-arm64_x86_64-simulator/GooglePlaces.framework/Resources/GooglePlaces.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle", ); name = "[CP] Copy Pods Resources"; @@ -2449,7 +2451,8 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Expo Go-Expo Go (unversioned)/Pods-Expo Go-Expo Go (unversioned)-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/Stripe/Stripe.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/StripeCore/StripeCore.bundle", @@ -2584,7 +2587,8 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Expo Go-Tests/Pods-Expo Go-Tests-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle", + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/Stripe/Stripe.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/StripeCore/StripeCore.bundle", @@ -3282,6 +3286,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = C8D8QTF339; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; EX_BUNDLE_NAME = Expo; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Exponent/Supporting/Exponent-Prefix.pch"; @@ -3593,6 +3598,7 @@ CODE_SIGN_IDENTITY = "Apple Distribution"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = C8D8QTF339; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; EX_BUNDLE_NAME = Expo; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Exponent/Supporting/Exponent-Prefix.pch"; diff --git a/ios/Podfile b/ios/Podfile index 98df2e1c294fd..7ec705b75c772 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -12,10 +12,9 @@ inhibit_all_warnings! $expo_updates_create_manifest = false abstract_target 'Expo Go' do - # Expo Client dependencies pod 'CocoaLumberjack', '~> 3.5.3' - pod 'GoogleMaps', '~> 7.1' - pod 'Google-Maps-iOS-Utils', '~> 4.1.0' + pod 'GoogleMaps', '~> 7.3.0' + pod 'Google-Maps-iOS-Utils', :git => 'https://github.com/googlemaps/google-maps-ios-utils.git' pod 'JKBigInteger', :podspec => 'vendored/common/JKBigInteger.podspec.json' pod 'MBProgressHUD', '~> 1.2.0' @@ -85,8 +84,6 @@ abstract_target 'Expo Go' do target_installation_result.native_target.build_configurations.each do |config| config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' - # Fix building failures on M1 - config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64' end if pod_name == 'Branch' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index bda865837bf0b..732f624029550 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1474,8 +1474,8 @@ PODS: - ABI48_0_0ExpoModulesCore - ABI48_0_0ExpoMaps (0.0.2): - ABI48_0_0ExpoModulesCore - - GoogleMaps (= 7.1.0) - - GooglePlaces (= 7.1.0) + - GoogleMaps (= 7.3.0) + - GooglePlaces (= 7.3.0) - ABI48_0_0ExpoModulesCore (1.2.6): - ABI48_0_0React-Core - ABI48_0_0React-RCTAppDelegate @@ -2025,12 +2025,12 @@ PODS: - StripePaymentsUI (~> 23.3.0) - ABI48_0_0UMAppLoader (4.1.1) - ABI48_0_0Yoga (1.14.0) - - Analytics (4.1.7) - - AppAuth (1.6.0): - - AppAuth/Core (= 1.6.0) - - AppAuth/ExternalUserAgent (= 1.6.0) - - AppAuth/Core (1.6.0) - - AppAuth/ExternalUserAgent (1.6.0): + - Analytics (4.1.8) + - AppAuth (1.6.2): + - AppAuth/Core (= 1.6.2) + - AppAuth/ExternalUserAgent (= 1.6.2) + - AppAuth/Core (1.6.2) + - AppAuth/ExternalUserAgent (1.6.2): - AppAuth/Core - ASN1Decoder (1.8.0) - boost (1.76.0) @@ -2218,8 +2218,8 @@ PODS: - ReachabilitySwift - React-Core - EXUpdatesInterface (0.9.2) - - FBAEMKit (15.1.0): - - FBSDKCoreKit_Basics (= 15.1.0) + - FBAEMKit (16.1.0): + - FBSDKCoreKit_Basics (= 16.1.0) - FBAudienceNetwork (6.12.0) - FBLazyVector (0.71.7) - FBReactNativeSpec (0.71.7): @@ -2229,10 +2229,10 @@ PODS: - React-Core (= 0.71.7) - React-jsi (= 0.71.7) - ReactCommon/turbomodule/core (= 0.71.7) - - FBSDKCoreKit (15.1.0): - - FBAEMKit (= 15.1.0) - - FBSDKCoreKit_Basics (= 15.1.0) - - FBSDKCoreKit_Basics (15.1.0) + - FBSDKCoreKit (16.1.0): + - FBAEMKit (= 16.1.0) + - FBSDKCoreKit_Basics (= 16.1.0) + - FBSDKCoreKit_Basics (16.1.0) - Firebase/Core (9.5.0): - Firebase/CoreOnly - FirebaseAnalytics (~> 9.5.0) @@ -2281,21 +2281,21 @@ PODS: - Google-Maps-iOS-Utils/GeometryUtils (= 4.1.0) - Google-Maps-iOS-Utils/Heatmap (= 4.1.0) - Google-Maps-iOS-Utils/QuadTree (= 4.1.0) - - GoogleMaps + - GoogleMaps (~> 7.3) - Google-Maps-iOS-Utils/Clustering (4.1.0): - Google-Maps-iOS-Utils/QuadTree - - GoogleMaps + - GoogleMaps (~> 7.3) - Google-Maps-iOS-Utils/Geometry (4.1.0): - - GoogleMaps + - GoogleMaps (~> 7.3) - Google-Maps-iOS-Utils/GeometryUtils (4.1.0): - - GoogleMaps + - GoogleMaps (~> 7.3) - Google-Maps-iOS-Utils/Heatmap (4.1.0): - Google-Maps-iOS-Utils/QuadTree - - GoogleMaps + - GoogleMaps (~> 7.3) - Google-Maps-iOS-Utils/QuadTree (4.1.0): - - GoogleMaps - - Google-Mobile-Ads-SDK (9.5.0): - - GoogleAppMeasurement (< 10.0, >= 7.0) + - GoogleMaps (~> 7.3) + - Google-Mobile-Ads-SDK (10.5.0): + - GoogleAppMeasurement (< 11.0, >= 7.0) - GoogleUserMessagingPlatform (>= 1.1) - GoogleAppMeasurement (9.5.0): - GoogleAppMeasurement/AdIdSupport (= 9.5.0) @@ -2317,58 +2317,58 @@ PODS: - GoogleUtilities/Network (~> 7.7) - "GoogleUtilities/NSData+zlib (~> 7.7)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleDataTransport (9.2.0): + - GoogleDataTransport (9.2.3): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleMaps (7.1.0): - - GoogleMaps/Maps (= 7.1.0) - - GoogleMaps/Base (7.1.0) - - GoogleMaps/Maps (7.1.0): + - GoogleMaps (7.3.0): + - GoogleMaps/Maps (= 7.3.0) + - GoogleMaps/Base (7.3.0) + - GoogleMaps/Maps (7.3.0): - GoogleMaps/Base - - GooglePlaces (7.1.0) + - GooglePlaces (7.3.0) - GoogleSignIn (7.0.0): - AppAuth (~> 1.5) - GTMAppAuth (< 3.0, >= 1.3) - GTMSessionFetcher/Core (< 4.0, >= 1.1) - GoogleUserMessagingPlatform (2.0.1) - - GoogleUtilities (7.8.0): - - GoogleUtilities/AppDelegateSwizzler (= 7.8.0) - - GoogleUtilities/Environment (= 7.8.0) - - GoogleUtilities/ISASwizzler (= 7.8.0) - - GoogleUtilities/Logger (= 7.8.0) - - GoogleUtilities/MethodSwizzler (= 7.8.0) - - GoogleUtilities/Network (= 7.8.0) - - "GoogleUtilities/NSData+zlib (= 7.8.0)" - - GoogleUtilities/Reachability (= 7.8.0) - - GoogleUtilities/SwizzlerTestHelpers (= 7.8.0) - - GoogleUtilities/UserDefaults (= 7.8.0) - - GoogleUtilities/AppDelegateSwizzler (7.8.0): + - GoogleUtilities (7.11.1): + - GoogleUtilities/AppDelegateSwizzler (= 7.11.1) + - GoogleUtilities/Environment (= 7.11.1) + - GoogleUtilities/ISASwizzler (= 7.11.1) + - GoogleUtilities/Logger (= 7.11.1) + - GoogleUtilities/MethodSwizzler (= 7.11.1) + - GoogleUtilities/Network (= 7.11.1) + - "GoogleUtilities/NSData+zlib (= 7.11.1)" + - GoogleUtilities/Reachability (= 7.11.1) + - GoogleUtilities/SwizzlerTestHelpers (= 7.11.1) + - GoogleUtilities/UserDefaults (= 7.11.1) + - GoogleUtilities/AppDelegateSwizzler (7.11.1): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.8.0): + - GoogleUtilities/Environment (7.11.1): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/ISASwizzler (7.8.0) - - GoogleUtilities/Logger (7.8.0): + - GoogleUtilities/ISASwizzler (7.11.1) + - GoogleUtilities/Logger (7.11.1): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.8.0): + - GoogleUtilities/MethodSwizzler (7.11.1): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.8.0): + - GoogleUtilities/Network (7.11.1): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.8.0)" - - GoogleUtilities/Reachability (7.8.0): + - "GoogleUtilities/NSData+zlib (7.11.1)" + - GoogleUtilities/Reachability (7.11.1): - GoogleUtilities/Logger - - GoogleUtilities/SwizzlerTestHelpers (7.8.0): + - GoogleUtilities/SwizzlerTestHelpers (7.11.1): - GoogleUtilities/MethodSwizzler - - GoogleUtilities/UserDefaults (7.8.0): + - GoogleUtilities/UserDefaults (7.11.1): - GoogleUtilities/Logger - GTMAppAuth (2.0.0): - AppAuth/Core (~> 1.6) - GTMSessionFetcher/Core (< 4.0, >= 1.5) - - GTMSessionFetcher/Core (1.7.2) + - GTMSessionFetcher/Core (3.1.1) - hermes-engine (0.71.7): - hermes-engine/Pre-built (= 0.71.7) - hermes-engine/Pre-built (0.71.7) @@ -2403,7 +2403,7 @@ PODS: - nanopb/decode (2.30909.0) - nanopb/encode (2.30909.0) - Nimble (9.2.1) - - PromisesObjC (2.1.1) + - PromisesObjC (2.2.0) - Quick (5.0.1) - RCT-Folly (2021.07.22.00): - boost @@ -2840,12 +2840,12 @@ PODS: - SDWebImageWebPCoder (0.11.0): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.15) - - Stripe (23.3.0): - - StripeApplePay (= 23.3.0) - - StripeCore (= 23.3.0) - - StripePayments (= 23.3.0) - - StripePaymentsUI (= 23.3.0) - - StripeUICore (= 23.3.0) + - Stripe (23.3.4): + - StripeApplePay (= 23.3.4) + - StripeCore (= 23.3.4) + - StripePayments (= 23.3.4) + - StripePaymentsUI (= 23.3.4) + - StripeUICore (= 23.3.4) - stripe-react-native (0.23.3): - React-Core - Stripe (~> 23.3.0) @@ -2854,28 +2854,28 @@ PODS: - StripePayments (~> 23.3.0) - StripePaymentSheet (~> 23.3.0) - StripePaymentsUI (~> 23.3.0) - - StripeApplePay (23.3.0): - - StripeCore (= 23.3.0) - - StripeCore (23.3.0) - - StripeFinancialConnections (23.3.0): - - StripeCore (= 23.3.0) - - StripeUICore (= 23.3.0) - - StripePayments (23.3.0): - - StripeCore (= 23.3.0) - - StripePayments/Stripe3DS2 (= 23.3.0) - - StripePayments/Stripe3DS2 (23.3.0): - - StripeCore (= 23.3.0) - - StripePaymentSheet (23.3.0): - - StripeApplePay (= 23.3.0) - - StripeCore (= 23.3.0) - - StripePayments (= 23.3.0) - - StripePaymentsUI (= 23.3.0) - - StripePaymentsUI (23.3.0): - - StripeCore (= 23.3.0) - - StripePayments (= 23.3.0) - - StripeUICore (= 23.3.0) - - StripeUICore (23.3.0): - - StripeCore (= 23.3.0) + - StripeApplePay (23.3.4): + - StripeCore (= 23.3.4) + - StripeCore (23.3.4) + - StripeFinancialConnections (23.3.4): + - StripeCore (= 23.3.4) + - StripeUICore (= 23.3.4) + - StripePayments (23.3.4): + - StripeCore (= 23.3.4) + - StripePayments/Stripe3DS2 (= 23.3.4) + - StripePayments/Stripe3DS2 (23.3.4): + - StripeCore (= 23.3.4) + - StripePaymentSheet (23.3.4): + - StripeApplePay (= 23.3.4) + - StripeCore (= 23.3.4) + - StripePayments (= 23.3.4) + - StripePaymentsUI (= 23.3.4) + - StripePaymentsUI (23.3.4): + - StripeCore (= 23.3.4) + - StripePayments (= 23.3.4) + - StripeUICore (= 23.3.4) + - StripeUICore (23.3.4): + - StripeCore (= 23.3.4) - UMAppLoader (4.1.2) - Yoga (1.14.0) - ZXingObjC/Core (3.6.5) @@ -3294,8 +3294,8 @@ DEPENDENCIES: - FBReactNativeSpec (from `../react-native-lab/react-native/React/FBReactNativeSpec`) - FirebaseCore - glog (from `../react-native-lab/react-native/third-party-podspecs/glog.podspec`) - - Google-Maps-iOS-Utils (~> 4.1.0) - - GoogleMaps (~> 7.1) + - Google-Maps-iOS-Utils (from `https://github.com/googlemaps/google-maps-ios-utils.git`) + - GoogleMaps (~> 7.3.0) - GoogleUtilities - hermes-engine (from `../react-native-lab/react-native/sdks/hermes-engine/hermes-engine.podspec`) - JKBigInteger (from `vendored/common/JKBigInteger.podspec.json`) @@ -3367,7 +3367,6 @@ SPEC REPOS: - FirebaseCoreInternal - FirebaseInstallations - fmt - - Google-Maps-iOS-Utils - Google-Mobile-Ads-SDK - GoogleAppMeasurement - GoogleDataTransport @@ -4188,6 +4187,8 @@ EXTERNAL SOURCES: :path: "../react-native-lab/react-native/React/FBReactNativeSpec" glog: :podspec: "../react-native-lab/react-native/third-party-podspecs/glog.podspec" + Google-Maps-iOS-Utils: + :git: https://github.com/googlemaps/google-maps-ios-utils.git hermes-engine: :podspec: "../react-native-lab/react-native/sdks/hermes-engine/hermes-engine.podspec" JKBigInteger: @@ -4285,6 +4286,11 @@ EXTERNAL SOURCES: Yoga: :path: "../react-native-lab/react-native/ReactCommon/yoga" +CHECKOUT OPTIONS: + Google-Maps-iOS-Utils: + :commit: 91bdf460d6e7d7970120f55dc8e7da67abf4edb3 + :git: https://github.com/googlemaps/google-maps-ios-utils.git + SPEC CHECKSUMS: ABI46_0_0EASClient: c419fef100fbdac83e755c790d6b427594d4263e ABI46_0_0EXAppleAuthentication: 61c95f030898d57ecbdf1e8fe05d9b43d463b507 @@ -4540,7 +4546,7 @@ SPEC CHECKSUMS: ABI48_0_0ExpoLocalAuthentication: 30b0231acd79565606e8494273c08741eed647c4 ABI48_0_0ExpoLocalization: 50fb5251edc025bfea84d90747b855286af31445 ABI48_0_0ExpoMailComposer: 12ae9d64df1b0a6e0a2e90ca8206a3fa6d96728f - ABI48_0_0ExpoMaps: f9b4accfd8f80291bf3850a465dc238082311edb + ABI48_0_0ExpoMaps: a21d8cd2a5afcb896273766e3d739a02f1e0ec3f ABI48_0_0ExpoModulesCore: 02af20edab0c5d204dbf8db5c24664f79aab7860 ABI48_0_0ExpoModulesProvider: 0ded590cc0f4056333f8f7b71834a7b1f46432b3 ABI48_0_0ExpoNetwork: d91a5fee7dba37ad4afa3e0aa79d3a26643f2b38 @@ -4611,8 +4617,8 @@ SPEC CHECKSUMS: ABI48_0_0stripe-react-native: 10d38e575f12896c284962183534058ece127c5e ABI48_0_0UMAppLoader: 142596799d5a7b05119ae9f5c4e51ccc590e49a5 ABI48_0_0Yoga: 13a232e4a5d1ecd44a45e050b5983aa20116b1fa - Analytics: 3106b5af9b799c934f98a68ab8ba199f1c603fdb - AppAuth: 8fca6b5563a5baef2c04bee27538025e4ceb2add + Analytics: 9655e0e1c71ea98107cfcb2b14891168acc6c6c9 + AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570 ASN1Decoder: 6110fdeacfdb41559b1481457a1645be716610aa boost: 57d2868c099736d80fcd648bf211b4431e51a558 Branch: 23b6b9351d5574377e7a764841cfb13a70c2799b @@ -4680,12 +4686,12 @@ SPEC CHECKSUMS: EXTaskManager: a7a387c4e222176988261341680aa7e3f621a335 EXUpdates: 3db8e104828f682f6db46130ff8fc929e5d373cb EXUpdatesInterface: c08eaa7e4d1fdafff3820e0539a6d42a75fa0258 - FBAEMKit: c7f82b5145d446bcbbcd50485c032689032fc6a2 + FBAEMKit: c7efe06720a8b15b1d25b68921ba46dee20996e0 FBAudienceNetwork: e0fcc9091fced34910ed0b6da06f129db46ac9e6 FBLazyVector: a89a0525bc7ca174675045c2b492b5280d5a2470 FBReactNativeSpec: 3851f344cf03f0cff3020fbf627e520a10fdfd32 - FBSDKCoreKit: 7542746fc63a2a38dd6a865eeb54268341f37b83 - FBSDKCoreKit_Basics: 92d6b26c0bed30ab09bbdd96dccaa26e6c9978d1 + FBSDKCoreKit: ca77d40d46786157b7b31ad3516f5ad9c2315339 + FBSDKCoreKit_Basics: d39c3361379def7297bf76738cdd4fd2e0eb1a68 Firebase: 800f16f07af493d98d017446a315c27af0552f41 FirebaseAnalytics: 1b60984a408320dda637306f3f733699ef8473d7 FirebaseCore: 25c0400b670fd1e2f2104349cd3b5dcce8d9418f @@ -4694,17 +4700,17 @@ SPEC CHECKSUMS: FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - Google-Maps-iOS-Utils: 3343332b18dfd5be8f1f44edd7d481ace3da4d9a - Google-Mobile-Ads-SDK: caf686ba55108412e02a3eedb136e12e488dbfaa + Google-Maps-iOS-Utils: 9aace2c8b9a6141bc7174115954ff89b3d17102b + Google-Mobile-Ads-SDK: d4846d2d9bfe840ad7444078b5f9f565032bd4c2 GoogleAppMeasurement: 6ee231473fbd75c11221dfce489894334024eead - GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleMaps: bc56ffb0324e345a2d91bac1a64a920f9c8f1b20 - GooglePlaces: 187946335ec3dc624de71c0a9ddcc712f19b0ee1 + GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd + GoogleMaps: a146f275ee429d14822178c7a841c03366ec92a1 + GooglePlaces: 0609463845250bbadafa1739938181e54dece439 GoogleSignIn: b232380cf495a429b8095d3178a8d5855b42e842 GoogleUserMessagingPlatform: 5f8b30daf181805317b6b985bb51c1ff3beca054 - GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 + GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749 GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae - GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba + GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72 hermes-engine: 4438d2b8bf8bebaba1b1ac0451160bab59e491f8 JKBigInteger: 5c72131974815e969c0782c41e3452f1bbe5619f libaom: 144606b1da4b5915a1054383c3a4459ccdb3c661 @@ -4717,7 +4723,7 @@ SPEC CHECKSUMS: MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 Nimble: d954d0accfd082f2225e62d71008440493e318f4 - PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb + PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef Quick: 749aa754fd1e7d984f2000fe051e18a3a9809179 RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: 5a4a30ac20c86eeadd6844a9328f78d4168cf9b2 @@ -4765,19 +4771,19 @@ SPEC CHECKSUMS: SDWebImageAVIFCoder: 4aeea8fdf65af5c18525ecb5bdd8b8ed9bb45019 SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499 - Stripe: 8a2e7c77fc28bff1d0961a129fac0cb2ed91ddcb + Stripe: 7393b16fe555d4a68e6555044e7b57eff11ae547 stripe-react-native: c71683ecc56c63eecbb7172c2f97c8ac737fa37c - StripeApplePay: 7b7a5e10891d2ea428cf1a3a737a07fe874f7e7d - StripeCore: 8122b0ffc76922ef0d3f3af3ecffd70c3bfabfc0 - StripeFinancialConnections: 84eba7226fb5fde44287c537dbc0b265ac90e2c4 - StripePayments: f263be25fd96ad8532399ecce4ac72447bcdd419 - StripePaymentSheet: d6838cf23dc2c0bc596634201771ceec63714d60 - StripePaymentsUI: 9b2e5059133fc2ee0e08c58e30a94045cd825b34 - StripeUICore: 484172573bdc2f02d4607a550551be45a090c137 + StripeApplePay: 174b09c0211134417e340c68af199a3dd34f3cd6 + StripeCore: babb08ec2b961f7cde8663dad3b4cbb77e0ae63b + StripeFinancialConnections: 484096f2dc5d3c20cc24a5ad4d261953ba806ef0 + StripePayments: 71bf62ccdacefc4b68b46a02a7f2492aeba252b3 + StripePaymentSheet: 722ea7bea092c243d771122fe3572a9c84512704 + StripePaymentsUI: fd08081c4be73c16322dc76a1878140520a9df2e + StripeUICore: ed68cbd5ad0626e0760e772f8c82d96cae9b829b UMAppLoader: d1cd37524ea948f9e695722994496784a6d6213c Yoga: d56980c8914db0b51692f55533409e844b66133c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 2cf03733a41a4d922f40ea96cd7e2b96ea352b03 +PODFILE CHECKSUM: 7261d0c78158329552e06df3542b8ca4a986f63b COCOAPODS: 1.12.1 diff --git a/ios/versioned/sdk48/ExpoMaps/ABI48_0_0ExpoMaps.podspec.json b/ios/versioned/sdk48/ExpoMaps/ABI48_0_0ExpoMaps.podspec.json index d24c72fe038b9..b86adbb2d7a80 100644 --- a/ios/versioned/sdk48/ExpoMaps/ABI48_0_0ExpoMaps.podspec.json +++ b/ios/versioned/sdk48/ExpoMaps/ABI48_0_0ExpoMaps.podspec.json @@ -18,10 +18,10 @@ "requires_arc": true, "dependencies": { "GoogleMaps": [ - "7.1.0" + "7.3.0" ], "GooglePlaces": [ - "7.1.0" + "7.3.0" ], "ABI48_0_0ExpoModulesCore": [] } diff --git a/packages/expo-maps/CHANGELOG.md b/packages/expo-maps/CHANGELOG.md index 3bd2e750a4c33..3ca7ef254a4fa 100644 --- a/packages/expo-maps/CHANGELOG.md +++ b/packages/expo-maps/CHANGELOG.md @@ -12,6 +12,8 @@ ### 💡 Others +- Moved the Google-Maps-iOS-Utils dependency to rely on git remote instead of a published package. ([#21249](https://github.com/expo/expo/pull/21249) by [@aleqsio](https://github.com/aleqsio)) + ## 0.0.2 — 2023-02-09 _This version does not introduce any user-facing changes._ diff --git a/packages/expo-maps/ios/ExpoMaps.podspec b/packages/expo-maps/ios/ExpoMaps.podspec index cc8415acbee95..58dd6e3270b31 100644 --- a/packages/expo-maps/ios/ExpoMaps.podspec +++ b/packages/expo-maps/ios/ExpoMaps.podspec @@ -18,7 +18,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.dependency 'ExpoModulesCore' - s.dependency 'GoogleMaps', '7.1.0' + s.dependency 'GoogleMaps', '7.3.0' # s.dependency 'Google-Maps-iOS-Utils', '4.1.0' - s.dependency 'GooglePlaces', '7.1.0' + s.dependency 'GooglePlaces', '7.3.0' end