From 775a7d8ae8d8fb529a956e93c68aa3210375b395 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Mon, 1 May 2023 13:35:30 -0500 Subject: [PATCH 1/6] Update xcode to 14e222b --- .ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 2d0db05cd45..c2eff748599 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -24,24 +24,24 @@ platform_properties: properties: dependencies: >- [ - {"dependency": "xcode", "version": "14c18"}, + {"dependency": "xcode", "version": "14e222b"}, {"dependency": "gems", "version": "v3.3.14"} ] os: Mac-12 device_type: none cpu: arm64 - xcode: 14c18 + xcode: 14e222b mac_x64: properties: dependencies: >- [ - {"dependency": "xcode", "version": "14c18"}, + {"dependency": "xcode", "version": "14e222b"}, {"dependency": "gems", "version": "v3.3.14"} ] os: Mac-12 device_type: none cpu: x86 - xcode: 14c18 + xcode: 14e222b targets: ### iOS+macOS tasks *** From 82a90e6f1f9b011de215dde77abc4c5b6049d8d5 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Mon, 1 May 2023 15:17:20 -0500 Subject: [PATCH 2/6] update functions to include void as argument --- .../google_sign_in_ios/ios/Classes/FLTGoogleSignInPlugin.m | 2 +- .../ios/Classes/FLTVideoPlayerPlugin.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google_sign_in/google_sign_in_ios/ios/Classes/FLTGoogleSignInPlugin.m b/packages/google_sign_in/google_sign_in_ios/ios/Classes/FLTGoogleSignInPlugin.m index 7beb604aaee..06992842286 100644 --- a/packages/google_sign_in/google_sign_in_ios/ios/Classes/FLTGoogleSignInPlugin.m +++ b/packages/google_sign_in/google_sign_in_ios/ios/Classes/FLTGoogleSignInPlugin.m @@ -14,7 +14,7 @@ static NSString *const kServerClientIdKey = @"SERVER_CLIENT_ID"; -static NSDictionary *loadGoogleServiceInfo() { +static NSDictionary *loadGoogleServiceInfo(void) { NSString *plistPath = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"]; if (plistPath) { diff --git a/packages/video_player/video_player_avfoundation/ios/Classes/FLTVideoPlayerPlugin.m b/packages/video_player/video_player_avfoundation/ios/Classes/FLTVideoPlayerPlugin.m index 586d6555bef..6c39cb9a4a7 100644 --- a/packages/video_player/video_player_avfoundation/ios/Classes/FLTVideoPlayerPlugin.m +++ b/packages/video_player/video_player_avfoundation/ios/Classes/FLTVideoPlayerPlugin.m @@ -146,7 +146,7 @@ NS_INLINE CGFloat radiansToDegrees(CGFloat radians) { return degrees; }; -NS_INLINE UIViewController *rootViewController() { +NS_INLINE UIViewController *rootViewController(void) { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" // TODO: (hellohuanlin) Provide a non-deprecated codepath. See From 7784aef5c9249bc028311018b3158b992bdad7a9 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Mon, 1 May 2023 15:18:31 -0500 Subject: [PATCH 3/6] update changelog and version --- packages/google_sign_in/google_sign_in_ios/CHANGELOG.md | 4 ++++ packages/google_sign_in/google_sign_in_ios/pubspec.yaml | 2 +- packages/video_player/video_player_avfoundation/CHANGELOG.md | 4 ++++ packages/video_player/video_player_avfoundation/pubspec.yaml | 2 +- 4 files changed, 10 insertions(+), 2 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 82cb24bd565..5d8b26b19be 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.6.2 + +* Update functions without a prototype to avoid deprecation warning. + ## 5.6.1 * Clarifies explanation of endorsement in README. 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 50c33f80aa1..6ce44b89b53 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.6.1 +version: 5.6.2 environment: sdk: ">=2.18.0 <4.0.0" diff --git a/packages/video_player/video_player_avfoundation/CHANGELOG.md b/packages/video_player/video_player_avfoundation/CHANGELOG.md index 8c1e2bc3426..08b7c830a46 100644 --- a/packages/video_player/video_player_avfoundation/CHANGELOG.md +++ b/packages/video_player/video_player_avfoundation/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.4.5 + +* Update functions without a prototype to avoid deprecation warning. + ## 2.4.4 * Updates pigeon to fix warnings with clang 15. diff --git a/packages/video_player/video_player_avfoundation/pubspec.yaml b/packages/video_player/video_player_avfoundation/pubspec.yaml index c579ee0be2e..53bbe63fce3 100644 --- a/packages/video_player/video_player_avfoundation/pubspec.yaml +++ b/packages/video_player/video_player_avfoundation/pubspec.yaml @@ -2,7 +2,7 @@ name: video_player_avfoundation description: iOS implementation of the video_player plugin. repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_avfoundation issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22 -version: 2.4.4 +version: 2.4.5 environment: sdk: ">=2.18.0 <4.0.0" From 54e0ed452e008889785a9acdaf804fa414c66dc4 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Mon, 1 May 2023 16:10:23 -0500 Subject: [PATCH 4/6] upgrade simulator to iOS 16.4 --- .ci/scripts/create_simulator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/create_simulator.sh b/.ci/scripts/create_simulator.sh index a12bbee0af0..41f6a1146db 100755 --- a/.ci/scripts/create_simulator.sh +++ b/.ci/scripts/create_simulator.sh @@ -6,7 +6,7 @@ # The name here must match remove_simulator.sh readonly DEVICE_NAME=Flutter-iPhone readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14 -readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-2 +readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-4 xcrun simctl list xcrun simctl create "$DEVICE_NAME" "$DEVICE" "$OS" | xargs xcrun simctl boot From 7106cb2c257d63b0573be2fee0243eb8e6975b04 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Tue, 2 May 2023 09:45:50 -0500 Subject: [PATCH 5/6] allow warnings --- script/tool/lib/src/podspec_check_command.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/tool/lib/src/podspec_check_command.dart b/script/tool/lib/src/podspec_check_command.dart index 4cda7210a8e..dda08eee32b 100644 --- a/script/tool/lib/src/podspec_check_command.dart +++ b/script/tool/lib/src/podspec_check_command.dart @@ -141,6 +141,9 @@ class PodspecCheckCommand extends PackageLoopingCommand { podspecPath, '--configuration=Debug', // Release targets unsupported arm64 simulators. Use Debug to only build against targeted x86_64 simulator devices. '--skip-tests', + // TODO(vashworth): remove allow-warnings when https://github.com/flutter/flutter/issues/125812 is fixed. + // https://github.com/flutter/flutter/issues/125812 + '--allow-warnings', '--use-modular-headers', // Flutter sets use_modular_headers! in its templates. if (libraryLint) '--use-libraries' ]; From f99e4cc9d0f7d8449b83b7670aca1ffecaff2a97 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Tue, 2 May 2023 10:31:47 -0500 Subject: [PATCH 6/6] add new flag to test --- script/tool/test/podspec_check_command_test.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/tool/test/podspec_check_command_test.dart b/script/tool/test/podspec_check_command_test.dart index a1244a2337b..a5815428273 100644 --- a/script/tool/test/podspec_check_command_test.dart +++ b/script/tool/test/podspec_check_command_test.dart @@ -143,6 +143,7 @@ void main() { .path, '--configuration=Debug', '--skip-tests', + '--allow-warnings', '--use-modular-headers', '--use-libraries' ], @@ -158,6 +159,7 @@ void main() { .path, '--configuration=Debug', '--skip-tests', + '--allow-warnings', '--use-modular-headers', ], packagesDir.path),