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 dd958dfb6d3..1b4a673e769 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 10c0b64a69b..321d522bfc1 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,12 +15,18 @@ 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' 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. 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 diff --git a/packages/google_sign_in/google_sign_in_ios/pubspec.yaml b/packages/google_sign_in/google_sign_in_ios/pubspec.yaml index 81592f09169..f0d7a3358c5 100644 --- a/packages/google_sign_in/google_sign_in_ios/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: google_sign_in_ios description: iOS implementation of the google_sign_in plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22 -version: 5.7.5 +version: 5.7.6 environment: sdk: ^3.2.3 diff --git a/script/tool/lib/src/fetch_deps_command.dart b/script/tool/lib/src/fetch_deps_command.dart index ddaff04a98e..f9bdd1beae7 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,28 @@ 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', + if (precacheIOS) + '--ios', + if (precacheMacOS) + '--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 f0696e0977c..e3acecc234d 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']), ];