From 25b0909a6efdc003f46d7b8f319495a48e796c1f Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Fri, 12 Oct 2018 18:57:49 +0800 Subject: [PATCH 1/2] [google_sign_in] Latest Android dependencies & added NonNull annotations --- packages/google_sign_in/CHANGELOG.md | 4 ++++ packages/google_sign_in/android/build.gradle | 6 +++--- .../flutter/plugins/googlesignin/GoogleSignInPlugin.java | 9 +++++---- packages/google_sign_in/example/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 3 ++- packages/google_sign_in/pubspec.yaml | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index 68b4e99870c1..e1a0c96f862b 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.2.2 + +* Updated Google Play Services dependency to version 16.0.1 + ## 3.2.1 * Set http version to be compatible with flutter_test. diff --git a/packages/google_sign_in/android/build.gradle b/packages/google_sign_in/android/build.gradle index d56cdd420303..05f9b0329f02 100755 --- a/packages/google_sign_in/android/build.gradle +++ b/packages/google_sign_in/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.0' } } @@ -34,6 +34,6 @@ android { } dependencies { - api 'com.google.android.gms:play-services-auth:15.+' - implementation 'com.google.guava:guava:20.0' + api 'com.google.android.gms:play-services-auth:16.0.1' + implementation 'com.google.guava:guava:26.0-android' } 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 87ed6785456f..b2bfdfcc76c8 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,6 +7,7 @@ import android.accounts.Account; import android.app.Activity; import android.content.Intent; +import android.support.annotation.NonNull; import com.google.android.gms.auth.GoogleAuthException; import com.google.android.gms.auth.GoogleAuthUtil; import com.google.android.gms.auth.UserRecoverableAuthException; @@ -109,7 +110,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 { @@ -272,7 +273,7 @@ public void signInSilently(Result result) { task.addOnCompleteListener( new OnCompleteListener() { @Override - public void onComplete(Task task) { + public void onComplete(@NonNull Task task) { onSignInResult(task); } }); @@ -307,7 +308,7 @@ public void signOut(Result result) { .addOnCompleteListener( new OnCompleteListener() { @Override - public void onComplete(Task task) { + public void onComplete(@NonNull Task task) { if (task.isSuccessful()) { finishWithSuccess(null); } else { @@ -327,7 +328,7 @@ public void disconnect(Result result) { .addOnCompleteListener( new OnCompleteListener() { @Override - public void onComplete(Task task) { + public void onComplete(@NonNull Task task) { if (task.isSuccessful()) { finishWithSuccess(null); } else { diff --git a/packages/google_sign_in/example/android/build.gradle b/packages/google_sign_in/example/android/build.gradle index d4225c7905bc..e81b1a1d5223 100755 --- a/packages/google_sign_in/example/android/build.gradle +++ b/packages/google_sign_in/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.0' } } diff --git a/packages/google_sign_in/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/google_sign_in/example/android/gradle/wrapper/gradle-wrapper.properties index b6517bb1d165..f2eaca0b31c7 100644 --- a/packages/google_sign_in/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/google_sign_in/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri Oct 12 18:26:59 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml index 3107e122fb5d..4e075cb14e95 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: 3.2.1 +version: 3.2.2 flutter: plugin: From 1adcfadc353088ea08b037053d48c7548b24ccf3 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Fri, 23 Nov 2018 15:45:37 +0800 Subject: [PATCH 2/2] use latest guava-android dependency, replace Guava usage w/ Android SDK methods when possible --- packages/google_sign_in/android/build.gradle | 2 +- .../flutter/plugins/googlesignin/GoogleSignInPlugin.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/google_sign_in/android/build.gradle b/packages/google_sign_in/android/build.gradle index 6fc918b184ba..e851a6244930 100755 --- a/packages/google_sign_in/android/build.gradle +++ b/packages/google_sign_in/android/build.gradle @@ -35,5 +35,5 @@ android { dependencies { api 'com.google.android.gms:play-services-auth:16.0.1' - implementation 'com.google.guava:guava:26.0-android' + implementation 'com.google.guava:guava:27.0.1-android' } 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 e7f425f5a8fd..17e014271c34 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 @@ -8,6 +8,7 @@ import android.app.Activity; import android.content.Intent; import android.support.annotation.NonNull; +import android.text.TextUtils; import com.google.android.gms.auth.GoogleAuthUtil; import com.google.android.gms.auth.UserRecoverableAuthException; import com.google.android.gms.auth.api.signin.GoogleSignIn; @@ -21,8 +22,6 @@ 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; @@ -244,7 +243,7 @@ public void init( for (String scope : requestedScopes) { optionsBuilder.requestScopes(new Scope(scope)); } - if (!Strings.isNullOrEmpty(hostedDomain)) { + if (!TextUtils.isEmpty(hostedDomain)) { optionsBuilder.setHostedDomain(hostedDomain); } @@ -449,7 +448,7 @@ public void getTokens( @Override public String call() throws Exception { Account account = new Account(email, "com.google"); - String scopesStr = "oauth2:" + Joiner.on(' ').join(requestedScopes); + String scopesStr = "oauth2:" + TextUtils.join(" ", requestedScopes); return GoogleAuthUtil.getToken(registrar.context(), account, scopesStr); } };