From 7269fbdacbfabdbda5ae1e318c901c0f078281da Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 29 Mar 2024 16:53:07 -0700 Subject: [PATCH 01/13] M --- .../google_sign_in_ios/CHANGELOG.md | 4 ++ .../darwin/google_sign_in_ios.podspec | 2 +- .../google_sign_in_ios/example/ios/Podfile | 2 + .../ios/Runner.xcodeproj/project.pbxproj | 66 +++++++++++++++---- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../google_sign_in_ios/pubspec.yaml | 2 +- 6 files changed, 64 insertions(+), 14 deletions(-) diff --git a/packages/google_sign_in/google_sign_in_ios/CHANGELOG.md b/packages/google_sign_in/google_sign_in_ios/CHANGELOG.md index dd958dfb6d36..1b4a673e7695 100644 --- a/packages/google_sign_in/google_sign_in_ios/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 5.7.6 + +* Upgrades GoogleSignIn iOS SDK to 7.1. + ## 5.7.5 * Pins GoogleSignIn to iOS SDK "7.0.0" while preparing the update to 7.1. diff --git a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec index 10c0b64a69b8..25ca53ed0cb8 100644 --- a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec +++ b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec @@ -15,7 +15,7 @@ Enables Google Sign-In in Flutter apps. s.source_files = 'Classes/**/*.{h,m}' s.public_header_files = 'Classes/**/*.h' s.module_map = 'Classes/FLTGoogleSignInPlugin.modulemap' - s.dependency 'GoogleSignIn', '~> 7.0.0' + s.dependency 'GoogleSignIn', '~> 7.1' s.static_framework = true s.ios.dependency 'Flutter' s.osx.dependency 'FlutterMacOS' diff --git a/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile b/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile index 66f053d0a5e7..b9d455976a0b 100644 --- a/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile +++ b/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile @@ -32,6 +32,8 @@ pod 'GTMAppAuth', :inhibit_warnings => true flutter_ios_podfile_setup target 'Runner' do + use_frameworks! + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) target 'RunnerTests' do inherit! :search_paths diff --git a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj index a577c5de44e0..505e7844b848 100644 --- a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -7,7 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 28EE448221894C28D4DE3C78 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11FC9A2A916DA042CC646294 /* Pods_Runner.framework */; }; 5C6F5A6E1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C6F5A6D1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.m */; }; + 63B39EFF1CBE0BC554178BD6 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1BCE5BEEA602054E071AD76 /* Pods_RunnerTests.framework */; }; 78A36DA12AF5761E00CBFD43 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7A303C2D1E89D76400B1F19E /* GoogleService-Info.plist */; }; 7ACDFB0E1E8944C400BE2D00 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7ACDFB0D1E8944C400BE2D00 /* AppFrameworkInfo.plist */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; @@ -15,8 +17,6 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - C2FB9CBA01DB0A2DE5F31E12 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0263E28FA425D1CE928BDE15 /* libPods-Runner.a */; }; - C56D3B06A42F3B35C1F47A43 /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18AD6475292B9C45B529DDC9 /* libPods-RunnerTests.a */; }; F76AC1A52666D0540040C8BC /* GoogleSignInTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F76AC1A42666D0540040C8BC /* GoogleSignInTests.m */; }; F76AC1B32666D0610040C8BC /* GoogleSignInUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = F76AC1B22666D0610040C8BC /* GoogleSignInUITests.m */; }; /* End PBXBuildFile section */ @@ -52,8 +52,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0263E28FA425D1CE928BDE15 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 18AD6475292B9C45B529DDC9 /* libPods-RunnerTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RunnerTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 11FC9A2A916DA042CC646294 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 37E582FF620A90D0EB2C0851 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 45D93D4513839BFEA2AA74FE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 5A76713E622F06379AEDEBFA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; @@ -72,6 +71,7 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + A1BCE5BEEA602054E071AD76 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F582639B44581540871D9BB0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; F76AC1A22666D0540040C8BC /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; F76AC1A42666D0540040C8BC /* GoogleSignInTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = GoogleSignInTests.m; path = ../../darwin/Tests/GoogleSignInTests.m; sourceTree = SOURCE_ROOT; }; @@ -86,7 +86,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C2FB9CBA01DB0A2DE5F31E12 /* libPods-Runner.a in Frameworks */, + 28EE448221894C28D4DE3C78 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -94,7 +94,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C56D3B06A42F3B35C1F47A43 /* libPods-RunnerTests.a in Frameworks */, + 63B39EFF1CBE0BC554178BD6 /* Pods_RunnerTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -180,8 +180,8 @@ CF3B75C9A7D2FA2A4C99F110 /* Frameworks */ = { isa = PBXGroup; children = ( - 0263E28FA425D1CE928BDE15 /* libPods-Runner.a */, - 18AD6475292B9C45B529DDC9 /* libPods-RunnerTests.a */, + 11FC9A2A916DA042CC646294 /* Pods_Runner.framework */, + A1BCE5BEEA602054E071AD76 /* Pods_RunnerTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -220,6 +220,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 532EA9D341340B1DCD08293D /* [CP] Copy Pods Resources */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + D7CAB9EA20662BFF5A2E156D /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -238,6 +239,7 @@ F76AC19E2666D0540040C8BC /* Sources */, F76AC19F2666D0540040C8BC /* Frameworks */, F76AC1A02666D0540040C8BC /* Resources */, + AC218329B4BFFACCA1805F86 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -273,7 +275,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "The Flutter Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -386,12 +388,10 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/google_sign_in_ios/google_sign_in_ios_privacy.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/google_sign_in_ios_privacy.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -432,6 +432,50 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + AC218329B4BFFACCA1805F86 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + D7CAB9EA20662BFF5A2E156D /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework", + "${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework", + "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", + "${BUILT_PRODUCTS_DIR}/GoogleSignIn/GoogleSignIn.framework", + "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppAuth.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleSignIn.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8e83ef7194ee..a937250e8c07 100644 --- a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 28 Mar 2024 12:56:19 -0700 Subject: [PATCH 02/13] extension_google_sign_in_as_googleapis_auth --- .../example/ios/Podfile | 2 ++ .../ios/Runner.xcodeproj/project.pbxproj | 28 +++++++++++++++---- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile index 414ba51f1c5d..01d4aa611bb9 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile @@ -28,6 +28,8 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe flutter_ios_podfile_setup target 'Runner' do + use_frameworks! + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) end diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/project.pbxproj b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/project.pbxproj index 69d834e431ab..f625335de253 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/project.pbxproj @@ -8,8 +8,8 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 2EC054F61939F3BFE7D5CDEE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09B4500CF9A21212486ADD44 /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3FE07DF92700035B2B89559A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 55916FA543087998FC65DEA4 /* libPods-Runner.a */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -31,10 +31,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 09B4500CF9A21212486ADD44 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 55916FA543087998FC65DEA4 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6F36D2D4BD58A793981ABE04 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -56,7 +56,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3FE07DF92700035B2B89559A /* libPods-Runner.a in Frameworks */, + 2EC054F61939F3BFE7D5CDEE /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -66,7 +66,7 @@ 3A6CF7EF6C0C80E66C0BA0F7 /* Frameworks */ = { isa = PBXGroup; children = ( - 55916FA543087998FC65DEA4 /* libPods-Runner.a */, + 09B4500CF9A21212486ADD44 /* Pods_Runner.framework */, ); name = Frameworks; sourceTree = ""; @@ -151,6 +151,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 8EC4EC08F4C005765E6C7516 /* [CP] Copy Pods Resources */, + 6F2208C7A716924D3DEC0AA4 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -167,7 +168,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -246,6 +247,23 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; + 6F2208C7A716924D3DEC0AA4 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 8EC4EC08F4C005765E6C7516 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a6b826db27d5..5e31d3d342f3 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 29 Mar 2024 13:10:40 -0700 Subject: [PATCH 03/13] Run 'pod repo update' during deps fetch --- script/tool/lib/src/fetch_deps_command.dart | 23 ++++++++++--------- script/tool/test/fetch_deps_command_test.dart | 12 ++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/script/tool/lib/src/fetch_deps_command.dart b/script/tool/lib/src/fetch_deps_command.dart index ddaff04a98e7..1c46e01e03be 100644 --- a/script/tool/lib/src/fetch_deps_command.dart +++ b/script/tool/lib/src/fetch_deps_command.dart @@ -11,6 +11,7 @@ import 'common/repository_package.dart'; const int _exitPrecacheFailed = 3; const int _exitNothingRequested = 4; +const int _exitPodUpdateFailed = 5; /// Download dependencies, both Dart and native. /// @@ -79,22 +80,22 @@ class FetchDepsCommand extends PackageLoopingCommand { // `pod install` requires having the platform artifacts precached. See // https://github.com/flutter/flutter/blob/fb7a763c640d247d090cbb373e4b3a0459ac171b/packages/flutter_tools/bin/podhelper.rb#L47 // https://github.com/flutter/flutter/blob/fb7a763c640d247d090cbb373e4b3a0459ac171b/packages/flutter_tools/bin/podhelper.rb#L130 - if (getBoolArg(platformIOS)) { - final int exitCode = await processRunner.runAndStream( + final bool precacheIos = getBoolArg(platformIOS); + final bool precacheMacOS = getBoolArg(platformMacOS); + if (precacheIos || precacheMacOS) { + final int precacheExitCode = await processRunner.runAndStream( flutterCommand, - ['precache', '--ios'], + ['precache', '--${precacheIos ? 'ios' : 'macos'}'], ); - if (exitCode != 0) { + if (precacheExitCode != 0) { throw ToolExit(_exitPrecacheFailed); } - } - if (getBoolArg(platformMacOS)) { - final int exitCode = await processRunner.runAndStream( - flutterCommand, - ['precache', '--macos'], + final int updateUpdateExitCode = await processRunner.runAndStream( + 'pod', + ['repo', 'update'], ); - if (exitCode != 0) { - throw ToolExit(_exitPrecacheFailed); + if (updateUpdateExitCode != 0) { + throw ToolExit(_exitPodUpdateFailed); } } } diff --git a/script/tool/test/fetch_deps_command_test.dart b/script/tool/test/fetch_deps_command_test.dart index f0696e0977c2..e3acecc234d8 100644 --- a/script/tool/test/fetch_deps_command_test.dart +++ b/script/tool/test/fetch_deps_command_test.dart @@ -409,6 +409,11 @@ void main() { ['precache', '--ios'], null, ), + const ProcessCall( + 'pod', + ['repo', 'update'], + null, + ), for (final Directory directory in exampleDirs) ProcessCall( 'flutter', @@ -436,6 +441,7 @@ void main() { .mockProcessesForExecutable[getFlutterCommand(mockPlatform)] = [ FakeProcessInfo(MockProcess(), ['precache']), + FakeProcessInfo(MockProcess(), ['repo', 'update']), FakeProcessInfo(MockProcess(exitCode: 1), ['build', 'ios', '--config-only']), ]; @@ -516,6 +522,11 @@ void main() { ['precache', '--macos'], null, ), + const ProcessCall( + 'pod', + ['repo', 'update'], + null, + ), for (final Directory directory in exampleDirs) ProcessCall( 'flutter', @@ -543,6 +554,7 @@ void main() { .mockProcessesForExecutable[getFlutterCommand(mockPlatform)] = [ FakeProcessInfo(MockProcess(), ['precache']), + FakeProcessInfo(MockProcess(), ['repo', 'update']), FakeProcessInfo(MockProcess(exitCode: 1), ['build', 'macos', '--config-only']), ]; From 81c3061ff0a257df088027e6c91d098d0f7b58fc Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 29 Mar 2024 14:28:14 -0700 Subject: [PATCH 04/13] deps --- .ci/targets/ios_build_all_packages.yaml | 4 ++++ .ci/targets/macos_build_all_packages.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.ci/targets/ios_build_all_packages.yaml b/.ci/targets/ios_build_all_packages.yaml index c85ec5c1f7cb..cae80e605d3e 100644 --- a/.ci/targets/ios_build_all_packages.yaml +++ b/.ci/targets/ios_build_all_packages.yaml @@ -2,6 +2,10 @@ tasks: - name: prepare tool script: .ci/scripts/prepare_tool.sh infra_step: true # Note infra steps failing prevents "always" from running. + - name: download Dart and iOS deps + script: .ci/scripts/tool_runner.sh + args: ["fetch-deps", "--ios", "--supporting-target-platforms-only"] + infra_step: true - name: create all_packages app script: .ci/scripts/create_all_packages_app.sh infra_step: true # Note infra steps failing prevents "always" from running. diff --git a/.ci/targets/macos_build_all_packages.yaml b/.ci/targets/macos_build_all_packages.yaml index 6cc476559593..b576457a1eef 100644 --- a/.ci/targets/macos_build_all_packages.yaml +++ b/.ci/targets/macos_build_all_packages.yaml @@ -2,6 +2,10 @@ tasks: - name: prepare tool script: .ci/scripts/prepare_tool.sh infra_step: true # Note infra steps failing prevents "always" from running. + - name: download Dart and macOS deps + script: .ci/scripts/tool_runner.sh + args: ["fetch-deps", "--macos", "--supporting-target-platforms-only"] + infra_step: true - name: create all_packages app script: .ci/scripts/create_all_packages_app.sh infra_step: true # Note infra steps failing prevents "always" from running. From c97d4dec06e16d24b79a7a85496ca7b50e2588da Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 29 Mar 2024 16:45:33 -0700 Subject: [PATCH 05/13] swift_version --- .../google_sign_in_ios/darwin/google_sign_in_ios.podspec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec index 25ca53ed0cb8..dc43ecf73c7f 100644 --- a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec +++ b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec @@ -22,5 +22,10 @@ Enables Google Sign-In in Flutter apps. s.ios.deployment_target = '12.0' s.osx.deployment_target = '10.15' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } + + # google_sign_in_ios does not contain Swift files. GoogleSignIn has a dependency on + # Swift pod GTMAppAuth. When built statically, there is a "pod lib lint" error unless + # swift_version is set. + s.swift_version = '5.0' s.resource_bundles = {'google_sign_in_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']} end From b852b4dffae1496ccf8968c171c96beadc3c4ca3 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 29 Mar 2024 16:48:25 -0700 Subject: [PATCH 06/13] update comment --- .../google_sign_in_ios/darwin/google_sign_in_ios.podspec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec index dc43ecf73c7f..321d522bfc17 100644 --- a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec +++ b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec @@ -23,9 +23,10 @@ Enables Google Sign-In in Flutter apps. s.osx.deployment_target = '10.15' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - # google_sign_in_ios does not contain Swift files. GoogleSignIn has a dependency on - # Swift pod GTMAppAuth. When built statically, there is a "pod lib lint" error unless - # swift_version is set. + # google_sign_in_ios does not contain Swift files. For some reason, there + # is a "pod lib lint" warning unless swift_version is set. This seems related to + # GoogleSignIn depending a Swift pod (GTMAppAuth). s.swift_version = '5.0' + s.resource_bundles = {'google_sign_in_ios_privacy' => ['Resources/PrivacyInfo.xcprivacy']} end From 0567405dd0b3ff1712c2050ca5f17f338327b1cf Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Wed, 3 Apr 2024 13:31:29 -0700 Subject: [PATCH 07/13] review edits --- script/tool/lib/src/fetch_deps_command.dart | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/script/tool/lib/src/fetch_deps_command.dart b/script/tool/lib/src/fetch_deps_command.dart index 1c46e01e03be..f9bdd1beae7f 100644 --- a/script/tool/lib/src/fetch_deps_command.dart +++ b/script/tool/lib/src/fetch_deps_command.dart @@ -80,12 +80,18 @@ class FetchDepsCommand extends PackageLoopingCommand { // `pod install` requires having the platform artifacts precached. See // https://github.com/flutter/flutter/blob/fb7a763c640d247d090cbb373e4b3a0459ac171b/packages/flutter_tools/bin/podhelper.rb#L47 // https://github.com/flutter/flutter/blob/fb7a763c640d247d090cbb373e4b3a0459ac171b/packages/flutter_tools/bin/podhelper.rb#L130 - final bool precacheIos = getBoolArg(platformIOS); + final bool precacheIOS = getBoolArg(platformIOS); final bool precacheMacOS = getBoolArg(platformMacOS); - if (precacheIos || precacheMacOS) { + if (precacheIOS || precacheMacOS) { final int precacheExitCode = await processRunner.runAndStream( flutterCommand, - ['precache', '--${precacheIos ? 'ios' : 'macos'}'], + [ + 'precache', + if (precacheIOS) + '--ios', + if (precacheMacOS) + '--macos', + ], ); if (precacheExitCode != 0) { throw ToolExit(_exitPrecacheFailed); From 780a66e68d7dc4d3c6f28e6362ec2762dead6399 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Wed, 3 Apr 2024 16:51:59 -0700 Subject: [PATCH 08/13] Try removing 'download Dart and iOS deps' steps --- .ci/targets/ios_build_all_packages.yaml | 4 ---- .ci/targets/macos_build_all_packages.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.ci/targets/ios_build_all_packages.yaml b/.ci/targets/ios_build_all_packages.yaml index cae80e605d3e..c85ec5c1f7cb 100644 --- a/.ci/targets/ios_build_all_packages.yaml +++ b/.ci/targets/ios_build_all_packages.yaml @@ -2,10 +2,6 @@ tasks: - name: prepare tool script: .ci/scripts/prepare_tool.sh infra_step: true # Note infra steps failing prevents "always" from running. - - name: download Dart and iOS deps - script: .ci/scripts/tool_runner.sh - args: ["fetch-deps", "--ios", "--supporting-target-platforms-only"] - infra_step: true - name: create all_packages app script: .ci/scripts/create_all_packages_app.sh infra_step: true # Note infra steps failing prevents "always" from running. diff --git a/.ci/targets/macos_build_all_packages.yaml b/.ci/targets/macos_build_all_packages.yaml index b576457a1eef..6cc476559593 100644 --- a/.ci/targets/macos_build_all_packages.yaml +++ b/.ci/targets/macos_build_all_packages.yaml @@ -2,10 +2,6 @@ tasks: - name: prepare tool script: .ci/scripts/prepare_tool.sh infra_step: true # Note infra steps failing prevents "always" from running. - - name: download Dart and macOS deps - script: .ci/scripts/tool_runner.sh - args: ["fetch-deps", "--macos", "--supporting-target-platforms-only"] - infra_step: true - name: create all_packages app script: .ci/scripts/create_all_packages_app.sh infra_step: true # Note infra steps failing prevents "always" from running. From 4380911be22161fb9296d29cef84b086e10a9073 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Wed, 3 Apr 2024 18:46:35 -0700 Subject: [PATCH 09/13] M --- .ci/targets/ios_build_all_packages.yaml | 4 ++++ .ci/targets/macos_build_all_packages.yaml | 4 ++++ .../example/ios/Podfile | 1 + .../google_sign_in/google_sign_in_ios/example/ios/Podfile | 1 + 4 files changed, 10 insertions(+) diff --git a/.ci/targets/ios_build_all_packages.yaml b/.ci/targets/ios_build_all_packages.yaml index c85ec5c1f7cb..cae80e605d3e 100644 --- a/.ci/targets/ios_build_all_packages.yaml +++ b/.ci/targets/ios_build_all_packages.yaml @@ -2,6 +2,10 @@ tasks: - name: prepare tool script: .ci/scripts/prepare_tool.sh infra_step: true # Note infra steps failing prevents "always" from running. + - name: download Dart and iOS deps + script: .ci/scripts/tool_runner.sh + args: ["fetch-deps", "--ios", "--supporting-target-platforms-only"] + infra_step: true - name: create all_packages app script: .ci/scripts/create_all_packages_app.sh infra_step: true # Note infra steps failing prevents "always" from running. diff --git a/.ci/targets/macos_build_all_packages.yaml b/.ci/targets/macos_build_all_packages.yaml index 6cc476559593..b576457a1eef 100644 --- a/.ci/targets/macos_build_all_packages.yaml +++ b/.ci/targets/macos_build_all_packages.yaml @@ -2,6 +2,10 @@ tasks: - name: prepare tool script: .ci/scripts/prepare_tool.sh infra_step: true # Note infra steps failing prevents "always" from running. + - name: download Dart and macOS deps + script: .ci/scripts/tool_runner.sh + args: ["fetch-deps", "--macos", "--supporting-target-platforms-only"] + infra_step: true - name: create all_packages app script: .ci/scripts/create_all_packages_app.sh infra_step: true # Note infra steps failing prevents "always" from running. diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile index 01d4aa611bb9..279576f3884f 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile @@ -29,6 +29,7 @@ flutter_ios_podfile_setup target 'Runner' do use_frameworks! + use_modular_headers! flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) end diff --git a/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile b/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile index b9d455976a0b..9fcdd875a9ac 100644 --- a/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile +++ b/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile @@ -33,6 +33,7 @@ flutter_ios_podfile_setup target 'Runner' do use_frameworks! + use_modular_headers! flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) target 'RunnerTests' do From f25e679357b7419f584920791bd46f350d71d20e Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Wed, 3 Apr 2024 20:36:12 -0700 Subject: [PATCH 10/13] Swap to Mac_x64 --- .ci.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 93e3d4035346..421f86e6f1c6 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -1091,9 +1091,10 @@ targets: # TODO(stuartmorgan): Remove "- packages" from all task names once # flutter/plugins is merged into this repo and turned down; it's here only # because names must be unique across all flutter repositories. - - name: Mac_arm64 macos_platform_tests master - packages + - name: Mac_x64 macos_platform_tests master - packages recipe: packages/packages timeout: 60 + bringup: true properties: channel: master add_recipes_cq: "true" @@ -1104,10 +1105,11 @@ targets: "CHANNEL": "master" } - - name: Mac_arm64 macos_platform_tests stable - packages + - name: Mac_x64 macos_platform_tests stable - packages recipe: packages/packages presubmit: false timeout: 60 + bringup: true properties: channel: stable version_file: flutter_stable.version From 741370215528eea059d04a6cb90435fd6d30818c Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 11 Apr 2024 17:15:17 -0700 Subject: [PATCH 11/13] Revert ci changes, Xcode project changes --- .ci.yaml | 6 +- .../example/ios/Podfile | 3 - .../ios/Runner.xcodeproj/project.pbxproj | 28 ++------ .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../darwin/google_sign_in_ios.podspec | 4 ++ .../google_sign_in_ios/example/ios/Podfile | 3 - .../ios/Runner.xcodeproj/project.pbxproj | 66 ++++--------------- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- 8 files changed, 24 insertions(+), 90 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 421f86e6f1c6..93e3d4035346 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -1091,10 +1091,9 @@ targets: # TODO(stuartmorgan): Remove "- packages" from all task names once # flutter/plugins is merged into this repo and turned down; it's here only # because names must be unique across all flutter repositories. - - name: Mac_x64 macos_platform_tests master - packages + - name: Mac_arm64 macos_platform_tests master - packages recipe: packages/packages timeout: 60 - bringup: true properties: channel: master add_recipes_cq: "true" @@ -1105,11 +1104,10 @@ targets: "CHANNEL": "master" } - - name: Mac_x64 macos_platform_tests stable - packages + - name: Mac_arm64 macos_platform_tests stable - packages recipe: packages/packages presubmit: false timeout: 60 - bringup: true properties: channel: stable version_file: flutter_stable.version diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile index 279576f3884f..414ba51f1c5d 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Podfile @@ -28,9 +28,6 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe flutter_ios_podfile_setup target 'Runner' do - use_frameworks! - use_modular_headers! - flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) end diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/project.pbxproj b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/project.pbxproj index f625335de253..69d834e431ab 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/project.pbxproj @@ -8,8 +8,8 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 2EC054F61939F3BFE7D5CDEE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09B4500CF9A21212486ADD44 /* Pods_Runner.framework */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 3FE07DF92700035B2B89559A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 55916FA543087998FC65DEA4 /* libPods-Runner.a */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -31,10 +31,10 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 09B4500CF9A21212486ADD44 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 55916FA543087998FC65DEA4 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6F36D2D4BD58A793981ABE04 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -56,7 +56,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2EC054F61939F3BFE7D5CDEE /* Pods_Runner.framework in Frameworks */, + 3FE07DF92700035B2B89559A /* libPods-Runner.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -66,7 +66,7 @@ 3A6CF7EF6C0C80E66C0BA0F7 /* Frameworks */ = { isa = PBXGroup; children = ( - 09B4500CF9A21212486ADD44 /* Pods_Runner.framework */, + 55916FA543087998FC65DEA4 /* libPods-Runner.a */, ); name = Frameworks; sourceTree = ""; @@ -151,7 +151,6 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 8EC4EC08F4C005765E6C7516 /* [CP] Copy Pods Resources */, - 6F2208C7A716924D3DEC0AA4 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -168,7 +167,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1510; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -247,23 +246,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 6F2208C7A716924D3DEC0AA4 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 8EC4EC08F4C005765E6C7516 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 5e31d3d342f3..a6b826db27d5 100644 --- a/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/extension_google_sign_in_as_googleapis_auth/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ 1.7.4' s.dependency 'GoogleSignIn', '~> 7.1' s.static_framework = true s.ios.dependency 'Flutter' diff --git a/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile b/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile index 9fcdd875a9ac..66f053d0a5e7 100644 --- a/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile +++ b/packages/google_sign_in/google_sign_in_ios/example/ios/Podfile @@ -32,9 +32,6 @@ pod 'GTMAppAuth', :inhibit_warnings => true flutter_ios_podfile_setup target 'Runner' do - use_frameworks! - use_modular_headers! - flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) target 'RunnerTests' do inherit! :search_paths diff --git a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj index 505e7844b848..a577c5de44e0 100644 --- a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -7,9 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 28EE448221894C28D4DE3C78 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11FC9A2A916DA042CC646294 /* Pods_Runner.framework */; }; 5C6F5A6E1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C6F5A6D1EC3B4CB008D64B5 /* GeneratedPluginRegistrant.m */; }; - 63B39EFF1CBE0BC554178BD6 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1BCE5BEEA602054E071AD76 /* Pods_RunnerTests.framework */; }; 78A36DA12AF5761E00CBFD43 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7A303C2D1E89D76400B1F19E /* GoogleService-Info.plist */; }; 7ACDFB0E1E8944C400BE2D00 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7ACDFB0D1E8944C400BE2D00 /* AppFrameworkInfo.plist */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; @@ -17,6 +15,8 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + C2FB9CBA01DB0A2DE5F31E12 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0263E28FA425D1CE928BDE15 /* libPods-Runner.a */; }; + C56D3B06A42F3B35C1F47A43 /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18AD6475292B9C45B529DDC9 /* libPods-RunnerTests.a */; }; F76AC1A52666D0540040C8BC /* GoogleSignInTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F76AC1A42666D0540040C8BC /* GoogleSignInTests.m */; }; F76AC1B32666D0610040C8BC /* GoogleSignInUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = F76AC1B22666D0610040C8BC /* GoogleSignInUITests.m */; }; /* End PBXBuildFile section */ @@ -52,7 +52,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 11FC9A2A916DA042CC646294 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0263E28FA425D1CE928BDE15 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 18AD6475292B9C45B529DDC9 /* libPods-RunnerTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RunnerTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 37E582FF620A90D0EB2C0851 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 45D93D4513839BFEA2AA74FE /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; 5A76713E622F06379AEDEBFA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; @@ -71,7 +72,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A1BCE5BEEA602054E071AD76 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F582639B44581540871D9BB0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; F76AC1A22666D0540040C8BC /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; F76AC1A42666D0540040C8BC /* GoogleSignInTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = GoogleSignInTests.m; path = ../../darwin/Tests/GoogleSignInTests.m; sourceTree = SOURCE_ROOT; }; @@ -86,7 +86,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 28EE448221894C28D4DE3C78 /* Pods_Runner.framework in Frameworks */, + C2FB9CBA01DB0A2DE5F31E12 /* libPods-Runner.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -94,7 +94,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 63B39EFF1CBE0BC554178BD6 /* Pods_RunnerTests.framework in Frameworks */, + C56D3B06A42F3B35C1F47A43 /* libPods-RunnerTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -180,8 +180,8 @@ CF3B75C9A7D2FA2A4C99F110 /* Frameworks */ = { isa = PBXGroup; children = ( - 11FC9A2A916DA042CC646294 /* Pods_Runner.framework */, - A1BCE5BEEA602054E071AD76 /* Pods_RunnerTests.framework */, + 0263E28FA425D1CE928BDE15 /* libPods-Runner.a */, + 18AD6475292B9C45B529DDC9 /* libPods-RunnerTests.a */, ); name = Frameworks; sourceTree = ""; @@ -220,7 +220,6 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 532EA9D341340B1DCD08293D /* [CP] Copy Pods Resources */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - D7CAB9EA20662BFF5A2E156D /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -239,7 +238,6 @@ F76AC19E2666D0540040C8BC /* Sources */, F76AC19F2666D0540040C8BC /* Frameworks */, F76AC1A02666D0540040C8BC /* Resources */, - AC218329B4BFFACCA1805F86 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -275,7 +273,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1510; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = "The Flutter Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -388,10 +386,12 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/google_sign_in_ios/google_sign_in_ios_privacy.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/google_sign_in_ios_privacy.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -432,50 +432,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - AC218329B4BFFACCA1805F86 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RunnerTests/Pods-RunnerTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - D7CAB9EA20662BFF5A2E156D /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework", - "${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework", - "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", - "${BUILT_PRODUCTS_DIR}/GoogleSignIn/GoogleSignIn.framework", - "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppAuth.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleSignIn.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a937250e8c07..8e83ef7194ee 100644 --- a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 16 Apr 2024 15:14:40 -0700 Subject: [PATCH 12/13] GTMSessionFetcher --- .../darwin/google_sign_in_ios.podspec | 9 +++++---- .../example/ios/Runner.xcodeproj/project.pbxproj | 10 +++++++++- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec index dfc6d03f93c6..67b95d3efa13 100644 --- a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec +++ b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec @@ -16,10 +16,11 @@ Enables Google Sign-In in Flutter apps. s.public_header_files = 'Classes/**/*.h' s.module_map = 'Classes/FLTGoogleSignInPlugin.modulemap' - # AppAuth is a transitive dependency of GoogleSignIn. - # Depend on 1.7.4 or higher, which defines modules. - s.dependency 'AppAuth', '~> 1.7.4' - s.dependency 'GoogleSignIn', '~> 7.1' + # AppAuth and GTMSessionFetcher are GoogleSignIn transitive dependencies. + # Depend on versions which defines modules. + s.dependency 'AppAuth', '>= 1.7.4' + s.dependency 'GTMSessionFetcher', '>= 3.4.0' + s.dependency 'GoogleSignIn', '>= 7.1' s.static_framework = true s.ios.dependency 'Flutter' s.osx.dependency 'FlutterMacOS' diff --git a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj index a577c5de44e0..03e7451a827f 100644 --- a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -273,7 +273,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "The Flutter Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -386,11 +386,19 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/AppAuth/AppAuthCore_Privacy.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth/GTMAppAuth_Privacy.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher/GTMSessionFetcher_Core_Privacy.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher/GTMSessionFetcher_Full_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/google_sign_in_ios/google_sign_in_ios_privacy.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppAuthCore_Privacy.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMAppAuth_Privacy.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMSessionFetcher_Core_Privacy.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMSessionFetcher_Full_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/google_sign_in_ios_privacy.bundle", ); diff --git a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8e83ef7194ee..a937250e8c07 100644 --- a/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/google_sign_in/google_sign_in_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 16 Apr 2024 15:19:29 -0700 Subject: [PATCH 13/13] ~> --- .../google_sign_in_ios/darwin/google_sign_in_ios.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec index 67b95d3efa13..4b3749d4f86f 100644 --- a/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec +++ b/packages/google_sign_in/google_sign_in_ios/darwin/google_sign_in_ios.podspec @@ -20,7 +20,7 @@ Enables Google Sign-In in Flutter apps. # Depend on versions which defines modules. s.dependency 'AppAuth', '>= 1.7.4' s.dependency 'GTMSessionFetcher', '>= 3.4.0' - s.dependency 'GoogleSignIn', '>= 7.1' + s.dependency 'GoogleSignIn', '~> 7.1' s.static_framework = true s.ios.dependency 'Flutter' s.osx.dependency 'FlutterMacOS'