From 577a4753021a663ca08d66f05d79be6109e291aa Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 26 Aug 2019 11:13:50 -0700 Subject: [PATCH 1/3] Prefer implementation dependencies over api dependencies --- packages/android_alarm_manager/CHANGELOG.md | 5 +++++ packages/android_alarm_manager/android/build.gradle | 2 +- packages/android_alarm_manager/pubspec.yaml | 2 +- packages/local_auth/CHANGELOG.md | 5 +++++ packages/local_auth/android/build.gradle | 6 +++--- packages/local_auth/pubspec.yaml | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md index 2bb200dcc2fc..c3148cfd698a 100644 --- a/packages/android_alarm_manager/CHANGELOG.md +++ b/packages/android_alarm_manager/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.4.4+1 + +* Switch from using `api` to `implementation` for dependency on `androidx`, + preventing version mismatch build failures in some Android configurations. + ## 0.4.4 * Add `id` to `callback` if it is of type `Function(int)` diff --git a/packages/android_alarm_manager/android/build.gradle b/packages/android_alarm_manager/android/build.gradle index 11c6be26861a..434f14745eb6 100644 --- a/packages/android_alarm_manager/android/build.gradle +++ b/packages/android_alarm_manager/android/build.gradle @@ -48,5 +48,5 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.0.0' - api 'androidx.core:core:1.0.1' + implementation 'androidx.core:core:1.0.1' } diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml index 9742dae02f81..acdaad5e488f 100644 --- a/packages/android_alarm_manager/pubspec.yaml +++ b/packages/android_alarm_manager/pubspec.yaml @@ -1,7 +1,7 @@ name: android_alarm_manager description: Flutter plugin for accessing the Android AlarmManager service, and running Dart code in the background when alarms fire. -version: 0.4.4 +version: 0.4.4+1 author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md index 1988028a1f9d..fb390cb115b4 100644 --- a/packages/local_auth/CHANGELOG.md +++ b/packages/local_auth/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.5.3+1 + +* Switch from using `api` to `implementation` for dependency on `androidx`, + preventing version mismatch build failures in some Android configurations. + ## 0.5.3 * Add face id detection as well by not relying on FingerprintCompat. diff --git a/packages/local_auth/android/build.gradle b/packages/local_auth/android/build.gradle index 142b606405c4..f0cb4121d92c 100644 --- a/packages/local_auth/android/build.gradle +++ b/packages/local_auth/android/build.gradle @@ -47,7 +47,7 @@ android { } dependencies { - api "androidx.core:core:1.1.0-beta01" - api "androidx.biometric:biometric:1.0.0-alpha04" - api "androidx.fragment:fragment:1.1.0-alpha06" + implementation "androidx.core:core:1.1.0-beta01" + implementation "androidx.biometric:biometric:1.0.0-alpha04" + implementation "androidx.fragment:fragment:1.1.0-alpha06" } diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml index 286d7aa73871..e3a4ae3dd65b 100644 --- a/packages/local_auth/pubspec.yaml +++ b/packages/local_auth/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Android and iOS device authentication sensors such as Fingerprint Reader and Touch ID. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/local_auth -version: 0.5.3 +version: 0.5.3+1 flutter: plugin: From fdc7cd7a5294d505f680f31097f08b623a58ab62 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 26 Aug 2019 11:16:07 -0700 Subject: [PATCH 2/3] Port google_sign_in --- packages/google_sign_in/CHANGELOG.md | 5 +++++ packages/google_sign_in/android/build.gradle | 2 +- packages/google_sign_in/pubspec.yaml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/google_sign_in/CHANGELOG.md b/packages/google_sign_in/CHANGELOG.md index 13aafeea58af..92bf3230e06c 100644 --- a/packages/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.7 + +* Switch from using `api` to `implementation` for dependency on `play-services-auth`, + preventing version mismatch build failures in some Android configurations. + ## 4.0.6 * Fixed the `PlatformException` leaking from `catchError()` in debug mode. diff --git a/packages/google_sign_in/android/build.gradle b/packages/google_sign_in/android/build.gradle index 9162c3080e50..cb7227abc3f7 100755 --- a/packages/google_sign_in/android/build.gradle +++ b/packages/google_sign_in/android/build.gradle @@ -47,6 +47,6 @@ android { } dependencies { - api 'com.google.android.gms:play-services-auth:16.0.1' + implementation 'com.google.android.gms:play-services-auth:16.0.1' implementation 'com.google.guava:guava:20.0' } diff --git a/packages/google_sign_in/pubspec.yaml b/packages/google_sign_in/pubspec.yaml index ee5ad7e3f861..6ed758895bf7 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.6 +version: 4.0.7 flutter: plugin: From f8a8bf42f2efbf5ce6715f5220fd95effc4f2311 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 26 Aug 2019 12:38:26 -0700 Subject: [PATCH 3/3] Roll back android_alarm_manager and local_auth --- packages/android_alarm_manager/CHANGELOG.md | 5 ----- packages/android_alarm_manager/android/build.gradle | 2 +- packages/android_alarm_manager/pubspec.yaml | 2 +- packages/local_auth/CHANGELOG.md | 5 ----- packages/local_auth/android/build.gradle | 6 +++--- packages/local_auth/pubspec.yaml | 2 +- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md index c3148cfd698a..2bb200dcc2fc 100644 --- a/packages/android_alarm_manager/CHANGELOG.md +++ b/packages/android_alarm_manager/CHANGELOG.md @@ -1,8 +1,3 @@ -## 0.4.4+1 - -* Switch from using `api` to `implementation` for dependency on `androidx`, - preventing version mismatch build failures in some Android configurations. - ## 0.4.4 * Add `id` to `callback` if it is of type `Function(int)` diff --git a/packages/android_alarm_manager/android/build.gradle b/packages/android_alarm_manager/android/build.gradle index 434f14745eb6..11c6be26861a 100644 --- a/packages/android_alarm_manager/android/build.gradle +++ b/packages/android_alarm_manager/android/build.gradle @@ -48,5 +48,5 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'androidx.core:core:1.0.1' + api 'androidx.core:core:1.0.1' } diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml index acdaad5e488f..9742dae02f81 100644 --- a/packages/android_alarm_manager/pubspec.yaml +++ b/packages/android_alarm_manager/pubspec.yaml @@ -1,7 +1,7 @@ name: android_alarm_manager description: Flutter plugin for accessing the Android AlarmManager service, and running Dart code in the background when alarms fire. -version: 0.4.4+1 +version: 0.4.4 author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md index fb390cb115b4..1988028a1f9d 100644 --- a/packages/local_auth/CHANGELOG.md +++ b/packages/local_auth/CHANGELOG.md @@ -1,8 +1,3 @@ -## 0.5.3+1 - -* Switch from using `api` to `implementation` for dependency on `androidx`, - preventing version mismatch build failures in some Android configurations. - ## 0.5.3 * Add face id detection as well by not relying on FingerprintCompat. diff --git a/packages/local_auth/android/build.gradle b/packages/local_auth/android/build.gradle index f0cb4121d92c..142b606405c4 100644 --- a/packages/local_auth/android/build.gradle +++ b/packages/local_auth/android/build.gradle @@ -47,7 +47,7 @@ android { } dependencies { - implementation "androidx.core:core:1.1.0-beta01" - implementation "androidx.biometric:biometric:1.0.0-alpha04" - implementation "androidx.fragment:fragment:1.1.0-alpha06" + api "androidx.core:core:1.1.0-beta01" + api "androidx.biometric:biometric:1.0.0-alpha04" + api "androidx.fragment:fragment:1.1.0-alpha06" } diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml index e3a4ae3dd65b..286d7aa73871 100644 --- a/packages/local_auth/pubspec.yaml +++ b/packages/local_auth/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Android and iOS device authentication sensors such as Fingerprint Reader and Touch ID. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/local_auth -version: 0.5.3+1 +version: 0.5.3 flutter: plugin: