From 62b3f4fdb36a6977499b372ab18cb251644435c9 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Fri, 26 Jul 2019 17:09:41 -0700 Subject: [PATCH 1/2] Fix annotation dependency --- packages/firebase_auth/CHANGELOG.md | 4 ++++ packages/firebase_auth/android/build.gradle | 3 ++- packages/firebase_auth/pubspec.yaml | 2 +- packages/firebase_in_app_messaging/CHANGELOG.md | 4 ++++ packages/firebase_in_app_messaging/android/build.gradle | 1 - packages/firebase_in_app_messaging/pubspec.yaml | 2 +- packages/image_picker/CHANGELOG.md | 4 ++++ packages/image_picker/android/build.gradle | 8 ++++---- packages/image_picker/pubspec.yaml | 2 +- packages/in_app_purchase/CHANGELOG.md | 4 ++++ packages/in_app_purchase/android/build.gradle | 1 + packages/in_app_purchase/pubspec.yaml | 2 +- packages/webview_flutter/CHANGELOG.md | 4 ++++ packages/webview_flutter/android/build.gradle | 1 + packages/webview_flutter/pubspec.yaml | 2 +- 15 files changed, 33 insertions(+), 11 deletions(-) diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md index 1728a08e358f..90bc2817e98f 100644 --- a/packages/firebase_auth/CHANGELOG.md +++ b/packages/firebase_auth/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.11.1+13 + +* Add dependency on `androidx.annotation:annotation:1.0.0`. + ## 0.11.1+12 * Update google-services Android gradle plugin to 4.3.0 in documentation and examples. diff --git a/packages/firebase_auth/android/build.gradle b/packages/firebase_auth/android/build.gradle index b6c763e108a7..3e1822be799e 100755 --- a/packages/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/android/build.gradle @@ -46,8 +46,9 @@ android { disable 'InvalidPackage' } dependencies { - api 'com.google.firebase:firebase-auth:17.0.0' + implementation 'androidx.annotation:annotation:1.0.0' implementation 'com.google.firebase:firebase-common:16.1.0' + api 'com.google.firebase:firebase-auth:17.0.0' api 'com.google.code.gson:gson:2.8.5' } } diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml index 238c1d38128d..e41e3969518e 100755 --- a/packages/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/pubspec.yaml @@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS like Google, Facebook and Twitter. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth -version: "0.11.1+12" +version: "0.11.1+13" flutter: plugin: diff --git a/packages/firebase_in_app_messaging/CHANGELOG.md b/packages/firebase_in_app_messaging/CHANGELOG.md index 90e5ad1611f2..8e61dbcd8134 100644 --- a/packages/firebase_in_app_messaging/CHANGELOG.md +++ b/packages/firebase_in_app_messaging/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.1+2 + +* Remove dependency `androidx.annotation:annotation:1.0.0`. + ## 0.0.1+1 * Update google-services Android gradle plugin to 4.3.0 in documentation and examples. diff --git a/packages/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/android/build.gradle index bcafa7898e5c..7570298a3deb 100644 --- a/packages/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/android/build.gradle @@ -33,6 +33,5 @@ android { } dependencies { api 'com.google.firebase:firebase-inappmessaging-display:18.0.1' - implementation 'androidx.annotation:annotation:1.0.0' } } diff --git a/packages/firebase_in_app_messaging/pubspec.yaml b/packages/firebase_in_app_messaging/pubspec.yaml index 6f47318d4d2f..0cbf0a37e647 100644 --- a/packages/firebase_in_app_messaging/pubspec.yaml +++ b/packages/firebase_in_app_messaging/pubspec.yaml @@ -1,6 +1,6 @@ name: firebase_in_app_messaging description: Flutter plugin for Firebase In-App Messaging. -version: 0.0.1+1 +version: 0.0.1+2 author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_in_app_messaging diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md index 44c8cc9dd01e..8852b9d021fb 100644 --- a/packages/image_picker/CHANGELOG.md +++ b/packages/image_picker/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.0+18 + +* Add dependency on `androidx.annotation:annotation:1.0.0`. + ## 0.6.0+17 * iOS: Fix a crash when user captures image from the camera with devices under iOS 11. diff --git a/packages/image_picker/android/build.gradle b/packages/image_picker/android/build.gradle index 7de0adc60eb9..d234a8fef294 100755 --- a/packages/image_picker/android/build.gradle +++ b/packages/image_picker/android/build.gradle @@ -47,8 +47,8 @@ android { lintOptions { disable 'InvalidPackage' } -} - -dependencies { - api 'androidx.legacy:legacy-support-v4:1.0.0' + dependencies { + api 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.annotation:annotation:1.0.0' + } } diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml index 721e6abdfbeb..9da16aa6edaf 100755 --- a/packages/image_picker/pubspec.yaml +++ b/packages/image_picker/pubspec.yaml @@ -6,7 +6,7 @@ authors: - Rhodes Davis Jr. homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker -version: 0.6.0+17 +version: 0.6.0+18 flutter: plugin: diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md index 5e3ce5ca35c0..b5b012def4da 100644 --- a/packages/in_app_purchase/CHANGELOG.md +++ b/packages/in_app_purchase/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.0+8 + +* Add dependency on `androidx.annotation:annotation:1.0.0`. + ## 0.2.0+7 * Make Gradle version compatible with the Android Gradle plugin version. diff --git a/packages/in_app_purchase/android/build.gradle b/packages/in_app_purchase/android/build.gradle index ce9afcdfc376..6be1b770312a 100644 --- a/packages/in_app_purchase/android/build.gradle +++ b/packages/in_app_purchase/android/build.gradle @@ -47,6 +47,7 @@ android { } dependencies { + implementation 'androidx.annotation:annotation:1.0.0' implementation 'com.android.billingclient:billing:1.2' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.17.0' diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml index 1db8d89b73d1..de9b60876dfd 100644 --- a/packages/in_app_purchase/pubspec.yaml +++ b/packages/in_app_purchase/pubspec.yaml @@ -2,7 +2,7 @@ name: in_app_purchase description: A Flutter plugin for in-app purchases. Exposes APIs for making in-app purchases through the App Store and Google Play. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase -version: 0.2.0+7 +version: 0.2.0+8 dependencies: async: ^2.0.8 diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index d8a48081eac9..d5801c7a6516 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.10+5 + +* Add dependency on `androidx.annotation:annotation:1.0.0`. + ## 0.3.10+4 * Add keyboard text to README. diff --git a/packages/webview_flutter/android/build.gradle b/packages/webview_flutter/android/build.gradle index 45ab74d37938..4fe7629b5f76 100644 --- a/packages/webview_flutter/android/build.gradle +++ b/packages/webview_flutter/android/build.gradle @@ -46,6 +46,7 @@ android { } dependencies { + implementation 'androidx.annotation:annotation:1.0.0' implementation 'androidx.webkit:webkit:1.0.0' } } diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml index 38033b73f142..c4940c215e0e 100644 --- a/packages/webview_flutter/pubspec.yaml +++ b/packages/webview_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: webview_flutter description: A Flutter plugin that provides a WebView widget on Android and iOS. -version: 0.3.10+4 +version: 0.3.10+5 author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter From 26b87d6fb2008e936ebd500ca41d6436f5282354 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Mon, 29 Jul 2019 13:40:02 -0700 Subject: [PATCH 2/2] [firebase_auth] Patch increment --- packages/firebase_auth/CHANGELOG.md | 2 +- packages/firebase_auth/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_auth/CHANGELOG.md b/packages/firebase_auth/CHANGELOG.md index 9324b3445659..6ad6dd218398 100644 --- a/packages/firebase_auth/CHANGELOG.md +++ b/packages/firebase_auth/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.13.1 +## 0.13.0+1 * Add dependency on `androidx.annotation:annotation:1.0.0`. diff --git a/packages/firebase_auth/pubspec.yaml b/packages/firebase_auth/pubspec.yaml index fb5a66887bc4..3cdcc3b419f3 100755 --- a/packages/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/pubspec.yaml @@ -4,7 +4,7 @@ description: Flutter plugin for Firebase Auth, enabling Android and iOS like Google, Facebook and Twitter. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_auth -version: 0.13.1 +version: 0.13.0+1 flutter: plugin: