From 06b88a6919597f5aa3e642b9f3989c65ce773165 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 15 Dec 2023 16:25:09 -0500 Subject: [PATCH 1/2] [google_sign_in] Correct clearAuthCache declarations During the NNBD migrations, the platform interface version was correctly converted to `required String token`, but the implemenatation (which was eventually copied during fully federating the plugin) was instead changed to `String? token`. Since accepting a nullable type is a valid override of accepting a non-nullable type it still compiled, but added unnecessary force unwrapping to the implementations. This cleans up the implementation declarations to match the platform interface. Fixes https://github.com/flutter/flutter/issues/129717 --- packages/google_sign_in/google_sign_in_android/CHANGELOG.md | 3 ++- .../google_sign_in_android/lib/google_sign_in_android.dart | 6 ++---- packages/google_sign_in/google_sign_in_android/pubspec.yaml | 2 +- packages/google_sign_in/google_sign_in_ios/CHANGELOG.md | 4 ++++ .../google_sign_in_ios/lib/google_sign_in_ios.dart | 2 +- packages/google_sign_in/google_sign_in_ios/pubspec.yaml | 2 +- .../google_sign_in_platform_interface/CHANGELOG.md | 4 ++++ .../lib/src/method_channel_google_sign_in.dart | 2 +- .../google_sign_in_platform_interface/pubspec.yaml | 2 +- 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md index fd2d7d67db2..7e42f74fcc7 100644 --- a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md @@ -1,5 +1,6 @@ -## NEXT +## 6.1.21 +* Updates `clearAuthCache` override to match base class declaration. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 6.1.20 diff --git a/packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart b/packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart index 48f4abb75ca..fda32600fa9 100644 --- a/packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart +++ b/packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart @@ -86,10 +86,8 @@ class GoogleSignInAndroid extends GoogleSignInPlatform { } @override - Future clearAuthCache({String? token}) { - // The token is not acutally nullable; see - // https://github.com/flutter/flutter/issues/129717 - return _api.clearAuthCache(token!); + Future clearAuthCache({required String token}) { + return _api.clearAuthCache(token); } @override diff --git a/packages/google_sign_in/google_sign_in_android/pubspec.yaml b/packages/google_sign_in/google_sign_in_android/pubspec.yaml index d121366de0a..91aebc1bf54 100644 --- a/packages/google_sign_in/google_sign_in_android/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_sign_in_android description: Android implementation of the google_sign_in plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22 -version: 6.1.20 +version: 6.1.21 environment: sdk: ">=3.0.0 <4.0.0" 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 6724341e98d..05415d72976 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.2 + +* Updates `clearAuthCache` override to match base class declaration. + ## 5.7.1 * Changes `pigeon` to a dev dependency. diff --git a/packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart b/packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart index 9c589501114..1ddaadfd759 100644 --- a/packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart +++ b/packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart @@ -86,7 +86,7 @@ class GoogleSignInIOS extends GoogleSignInPlatform { } @override - Future clearAuthCache({String? token}) async { + Future clearAuthCache({required String token}) async { // There's nothing to be done here on iOS since the expired/invalid // tokens are refreshed automatically by getTokens. } 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 d3a6316b651..579ac533d87 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.1 +version: 5.7.2 environment: sdk: ">=3.2.0 <4.0.0" diff --git a/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md b/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md index eba3544dd3b..aae4b830aa2 100644 --- a/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.4.4 + +* Updates `clearAuthCache` override to match base class declaration. + ## 2.4.3 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. diff --git a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart index c3b158dd845..fde29aeb8e4 100644 --- a/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart +++ b/packages/google_sign_in/google_sign_in_platform_interface/lib/src/method_channel_google_sign_in.dart @@ -84,7 +84,7 @@ class MethodChannelGoogleSignIn extends GoogleSignInPlatform { } @override - Future clearAuthCache({String? token}) { + Future clearAuthCache({required String token}) { return channel.invokeMethod( 'clearAuthCache', {'token': token}, diff --git a/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml b/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml index 883d08957d3..7a8822f9aee 100644 --- a/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in_platform_interface/pubspec.yaml @@ -4,7 +4,7 @@ repository: https://github.com/flutter/packages/tree/main/packages/google_sign_i issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22 # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes -version: 2.4.3 +version: 2.4.4 environment: sdk: ">=3.0.0 <4.0.0" From 2dbf2789317fc53a97e959d2d258a9fd0051cbaa Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 3 Jan 2024 11:28:45 -0500 Subject: [PATCH 2/2] Revert non-interface packages --- packages/google_sign_in/google_sign_in_android/CHANGELOG.md | 3 +-- .../google_sign_in_android/lib/google_sign_in_android.dart | 6 ++++-- packages/google_sign_in/google_sign_in_android/pubspec.yaml | 2 +- packages/google_sign_in/google_sign_in_ios/CHANGELOG.md | 4 ---- .../google_sign_in_ios/lib/google_sign_in_ios.dart | 2 +- packages/google_sign_in/google_sign_in_ios/pubspec.yaml | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md index 7e42f74fcc7..fd2d7d67db2 100644 --- a/packages/google_sign_in/google_sign_in_android/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in_android/CHANGELOG.md @@ -1,6 +1,5 @@ -## 6.1.21 +## NEXT -* Updates `clearAuthCache` override to match base class declaration. * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. ## 6.1.20 diff --git a/packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart b/packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart index fda32600fa9..48f4abb75ca 100644 --- a/packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart +++ b/packages/google_sign_in/google_sign_in_android/lib/google_sign_in_android.dart @@ -86,8 +86,10 @@ class GoogleSignInAndroid extends GoogleSignInPlatform { } @override - Future clearAuthCache({required String token}) { - return _api.clearAuthCache(token); + Future clearAuthCache({String? token}) { + // The token is not acutally nullable; see + // https://github.com/flutter/flutter/issues/129717 + return _api.clearAuthCache(token!); } @override diff --git a/packages/google_sign_in/google_sign_in_android/pubspec.yaml b/packages/google_sign_in/google_sign_in_android/pubspec.yaml index 91aebc1bf54..d121366de0a 100644 --- a/packages/google_sign_in/google_sign_in_android/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in_android/pubspec.yaml @@ -2,7 +2,7 @@ name: google_sign_in_android description: Android implementation of the google_sign_in plugin. repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22 -version: 6.1.21 +version: 6.1.20 environment: sdk: ">=3.0.0 <4.0.0" 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 05415d72976..6724341e98d 100644 --- a/packages/google_sign_in/google_sign_in_ios/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in_ios/CHANGELOG.md @@ -1,7 +1,3 @@ -## 5.7.2 - -* Updates `clearAuthCache` override to match base class declaration. - ## 5.7.1 * Changes `pigeon` to a dev dependency. diff --git a/packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart b/packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart index 1ddaadfd759..9c589501114 100644 --- a/packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart +++ b/packages/google_sign_in/google_sign_in_ios/lib/google_sign_in_ios.dart @@ -86,7 +86,7 @@ class GoogleSignInIOS extends GoogleSignInPlatform { } @override - Future clearAuthCache({required String token}) async { + Future clearAuthCache({String? token}) async { // There's nothing to be done here on iOS since the expired/invalid // tokens are refreshed automatically by getTokens. } 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 579ac533d87..d3a6316b651 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.2 +version: 5.7.1 environment: sdk: ">=3.2.0 <4.0.0"