From 9538a2f9e367cb407b2c455db7260558a89f573b Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Wed, 10 Jul 2019 10:50:06 -0700 Subject: [PATCH 1/3] Revert "[google_sign_in] Added NonNull annotations, reduce Guava usage (#844)" This reverts commit 19bdccee76eb1063063fa5300b885d3cc70c9019. --- packages/google_sign_in/CHANGELOG.md | 5 ----- packages/google_sign_in/android/build.gradle | 2 +- .../plugins/googlesignin/GoogleSignInPlugin.java | 16 ++++++++-------- packages/google_sign_in/pubspec.yaml | 2 +- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index bbbba373b3d9..0a4e8d21cca8 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,8 +1,3 @@ -## 4.0.3 - -* Update guava to `27.0.1-android`. -* Add correct @NonNull annotations to reduce compiler warnings. - ## 4.0.2 * Add missing template type parameter to `invokeMethod` calls. diff --git a/packages/google_sign_in/android/build.gradle b/packages/google_sign_in/android/build.gradle index c6e0acdb5ff8..9162c3080e50 100755 --- a/packages/google_sign_in/android/build.gradle +++ b/packages/google_sign_in/android/build.gradle @@ -48,5 +48,5 @@ android { dependencies { api 'com.google.android.gms:play-services-auth:16.0.1' - implementation 'com.google.guava:guava:27.0.1-android' + implementation 'com.google.guava:guava:20.0' } diff --git a/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java b/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java index 5c292414057d..d2fc260c7b1c 100755 --- a/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java +++ b/packages/google_sign_in/android/src/main/java/io/flutter/plugins/googlesignin/GoogleSignInPlugin.java @@ -7,8 +7,6 @@ import android.accounts.Account; import android.app.Activity; import android.content.Intent; -import android.text.TextUtils; -import androidx.annotation.NonNull; import com.google.android.gms.auth.GoogleAuthUtil; import com.google.android.gms.auth.UserRecoverableAuthException; import com.google.android.gms.auth.api.signin.GoogleSignIn; @@ -22,6 +20,8 @@ import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.RuntimeExecutionException; import com.google.android.gms.tasks.Task; +import com.google.common.base.Joiner; +import com.google.common.base.Strings; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; @@ -107,7 +107,7 @@ public void onMethodCall(MethodCall call, Result result) { /** * A delegate interface that exposes all of the sign-in functionality for other plugins to use. - * The below {@link Delegate} implementation should be used by any clients unless they need to + * The below {@link #Delegate} implementation should be used by any clients unless they need to * override some of these functions, such as for testing. */ public interface IDelegate { @@ -243,7 +243,7 @@ public void init( for (String scope : requestedScopes) { optionsBuilder.requestScopes(new Scope(scope)); } - if (!TextUtils.isEmpty(hostedDomain)) { + if (!Strings.isNullOrEmpty(hostedDomain)) { optionsBuilder.setHostedDomain(hostedDomain); } @@ -270,7 +270,7 @@ public void signInSilently(Result result) { task.addOnCompleteListener( new OnCompleteListener() { @Override - public void onComplete(@NonNull Task task) { + public void onComplete(Task task) { onSignInResult(task); } }); @@ -305,7 +305,7 @@ public void signOut(Result result) { .addOnCompleteListener( new OnCompleteListener() { @Override - public void onComplete(@NonNull Task task) { + public void onComplete(Task task) { if (task.isSuccessful()) { finishWithSuccess(null); } else { @@ -325,7 +325,7 @@ public void disconnect(Result result) { .addOnCompleteListener( new OnCompleteListener() { @Override - public void onComplete(@NonNull Task task) { + public void onComplete(Task task) { if (task.isSuccessful()) { finishWithSuccess(null); } else { @@ -448,7 +448,7 @@ public void getTokens( @Override public String call() throws Exception { Account account = new Account(email, "com.google"); - String scopesStr = "oauth2:" + TextUtils.join(" ", requestedScopes); + String scopesStr = "oauth2:" + Joiner.on(' ').join(requestedScopes); return GoogleAuthUtil.getToken(registrar.context(), account, scopesStr); } }; diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml index f9c18839b048..4a14005956ca 100755 --- a/packages/google_sign_in/pubspec.yaml +++ b/packages/google_sign_in/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system for signing in with a Google account on Android and iOS. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in -version: 4.0.3 +version: 4.0.2 flutter: plugin: From 66ff26d6a077d866a7c8635453cc6a0a9fe8c676 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Wed, 10 Jul 2019 10:55:10 -0700 Subject: [PATCH 2/3] update the changelog --- packages/google_sign_in/CHANGELOG.md | 5 +++++ packages/google_sign_in/pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index 0a4e8d21cca8..e3165f263101 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.3 + +* Update guava to `27.0.1-android`. +* Add correct @NonNull annotations to reduce compiler warnings. + ## 4.0.2 * Add missing template type parameter to `invokeMethod` calls. diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml index 4a14005956ca..7d12a470ecb2 100755 --- a/packages/google_sign_in/pubspec.yaml +++ b/packages/google_sign_in/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system for signing in with a Google account on Android and iOS. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in -version: 4.0.2 +version: 4.0.4 flutter: plugin: From e78981de48cefd7dbf43591f18205ba0b472e5e0 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Wed, 10 Jul 2019 10:55:40 -0700 Subject: [PATCH 3/3] add 4.0.4 to changelog --- packages/google_sign_in/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index e3165f263101..7c89f3f71a39 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.0.4 + +* Revert changes in 4.0.3. + ## 4.0.3 * Update guava to `27.0.1-android`.