From 0277ae7541452007414038c382766da6ef7dbfdd Mon Sep 17 00:00:00 2001 From: cg021 <40409839+cg021@users.noreply.github.com> Date: Wed, 20 May 2020 20:46:42 -0500 Subject: [PATCH] remove android no-op implementation (#2782) --- .../google_sign_in_web/CHANGELOG.md | 4 +++ .../google_sign_in_web/android/build.gradle | 33 ------------------- .../android/gradle.properties | 2 -- .../gradle/wrapper/gradle-wrapper.properties | 5 --- .../android/settings.gradle | 1 - .../android/src/main/AndroidManifest.xml | 3 -- .../GoogleSignInWebPlugin.java | 24 -------------- .../google_sign_in_web/pubspec.yaml | 2 +- 8 files changed, 5 insertions(+), 69 deletions(-) delete mode 100644 packages/google_sign_in/google_sign_in_web/android/build.gradle delete mode 100644 packages/google_sign_in/google_sign_in_web/android/gradle.properties delete mode 100644 packages/google_sign_in/google_sign_in_web/android/gradle/wrapper/gradle-wrapper.properties delete mode 100644 packages/google_sign_in/google_sign_in_web/android/settings.gradle delete mode 100644 packages/google_sign_in/google_sign_in_web/android/src/main/AndroidManifest.xml delete mode 100644 packages/google_sign_in/google_sign_in_web/android/src/main/java/io/flutter/plugins/google_sign_in_web/GoogleSignInWebPlugin.java diff --git a/packages/google_sign_in/google_sign_in_web/CHANGELOG.md b/packages/google_sign_in/google_sign_in_web/CHANGELOG.md index 74d5c8bbdb37..af6b1a08b122 100644 --- a/packages/google_sign_in/google_sign_in_web/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.9.1+1 + +* Remove Android folder from `google_sign_in_web`. + ## 0.9.1 * Ensure the web code returns `null` when the user is not signed in, instead of a `null-object` User. Fixes [issue 52338](https://github.com/flutter/flutter/issues/52338). diff --git a/packages/google_sign_in/google_sign_in_web/android/build.gradle b/packages/google_sign_in/google_sign_in_web/android/build.gradle deleted file mode 100644 index c69092f76006..000000000000 --- a/packages/google_sign_in/google_sign_in_web/android/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -group 'io.flutter.plugins.google_sign_in_web' -version '1.0' - -buildscript { - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' - } -} - -rootProject.allprojects { - repositories { - google() - jcenter() - } -} - -apply plugin: 'com.android.library' - -android { - compileSdkVersion 28 - - defaultConfig { - minSdkVersion 16 - } - lintOptions { - disable 'InvalidPackage' - } -} diff --git a/packages/google_sign_in/google_sign_in_web/android/gradle.properties b/packages/google_sign_in/google_sign_in_web/android/gradle.properties deleted file mode 100644 index 7be3d8b46841..000000000000 --- a/packages/google_sign_in/google_sign_in_web/android/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -org.gradle.jvmargs=-Xmx1536M -android.enableR8=true diff --git a/packages/google_sign_in/google_sign_in_web/android/gradle/wrapper/gradle-wrapper.properties b/packages/google_sign_in/google_sign_in_web/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 019065d1d650..000000000000 --- a/packages/google_sign_in/google_sign_in_web/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip diff --git a/packages/google_sign_in/google_sign_in_web/android/settings.gradle b/packages/google_sign_in/google_sign_in_web/android/settings.gradle deleted file mode 100644 index 240e74e2cd99..000000000000 --- a/packages/google_sign_in/google_sign_in_web/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'google_sign_in_web' diff --git a/packages/google_sign_in/google_sign_in_web/android/src/main/AndroidManifest.xml b/packages/google_sign_in/google_sign_in_web/android/src/main/AndroidManifest.xml deleted file mode 100644 index 9921be43a405..000000000000 --- a/packages/google_sign_in/google_sign_in_web/android/src/main/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/packages/google_sign_in/google_sign_in_web/android/src/main/java/io/flutter/plugins/google_sign_in_web/GoogleSignInWebPlugin.java b/packages/google_sign_in/google_sign_in_web/android/src/main/java/io/flutter/plugins/google_sign_in_web/GoogleSignInWebPlugin.java deleted file mode 100644 index 3b4fdcd69b21..000000000000 --- a/packages/google_sign_in/google_sign_in_web/android/src/main/java/io/flutter/plugins/google_sign_in_web/GoogleSignInWebPlugin.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.flutter.plugins.google_sign_in_web; - -import io.flutter.embedding.engine.plugins.FlutterPlugin; -import io.flutter.plugin.common.PluginRegistry.Registrar; - -/** GoogleSignInWebPlugin */ -public class GoogleSignInWebPlugin implements FlutterPlugin { - @Override - public void onAttachedToEngine(FlutterPluginBinding flutterPluginBinding) {} - - // This static function is optional and equivalent to onAttachedToEngine. It supports the old - // pre-Flutter-1.12 Android projects. You are encouraged to continue supporting - // plugin registration via this function while apps migrate to use the new Android APIs - // post-flutter-1.12 via https://flutter.dev/go/android-project-migration. - // - // It is encouraged to share logic between onAttachedToEngine and registerWith to keep - // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called - // depending on the user's project. onAttachedToEngine or registerWith must both be defined - // in the same class. - public static void registerWith(Registrar registrar) {} - - @Override - public void onDetachedFromEngine(FlutterPluginBinding binding) {} -} diff --git a/packages/google_sign_in/google_sign_in_web/pubspec.yaml b/packages/google_sign_in/google_sign_in_web/pubspec.yaml index 90dca0e13303..76922d9eb8e6 100644 --- a/packages/google_sign_in/google_sign_in_web/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in_web/pubspec.yaml @@ -2,7 +2,7 @@ name: google_sign_in_web description: Flutter plugin for Google Sign-In, a secure authentication system for signing in with a Google account on Android, iOS and Web. homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in_web -version: 0.9.1 +version: 0.9.1+1 flutter: plugin: