From 793422cf4bf3f3a16fc88d9ab7ffa3f6f34aae25 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Tue, 19 Nov 2019 14:40:32 +0000 Subject: [PATCH 1/8] Bumps AGP to 3.5.2 --- packages/firebase_analytics/android/build.gradle | 2 +- packages/firebase_analytics/example/android/build.gradle | 2 +- packages/firebase_analytics/example/android/gradle.properties | 1 + .../example/android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle index ccaa1cbaae74..55e69136f8c0 100755 --- a/packages/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.2' } } diff --git a/packages/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/example/android/build.gradle index 3f271ea72055..af7defff8284 100755 --- a/packages/firebase_analytics/example/android/build.gradle +++ b/packages/firebase_analytics/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.2' classpath 'com.google.gms:google-services:4.3.0' } } diff --git a/packages/firebase_analytics/example/android/gradle.properties b/packages/firebase_analytics/example/android/gradle.properties index 08f2b5f91bff..d2032bce8be6 100755 --- a/packages/firebase_analytics/example/android/gradle.properties +++ b/packages/firebase_analytics/example/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.enableJetifier=true android.useAndroidX=true +android.enableR8=true diff --git a/packages/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties index 0c59c158ca01..418c06eaec91 100644 --- a/packages/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 31 23:52:55 BRT 2019 +#Tue Nov 19 14:39:44 GMT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From 4260f1e923c5b0ecae789584a26a3398fd223834 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Tue, 19 Nov 2019 14:44:13 +0000 Subject: [PATCH 2/8] Bumps Firebase Analytics dependency to 17.2.1 & FB common to 19.3.0 --- packages/firebase_analytics/android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle index 55e69136f8c0..abec2e338f4e 100755 --- a/packages/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/android/build.gradle @@ -32,8 +32,8 @@ android { disable 'InvalidPackage' } dependencies { - api 'com.google.firebase:firebase-analytics:16.5.0' - implementation 'com.google.firebase:firebase-common:16.1.0' + api 'com.google.firebase:firebase-analytics:17.2.1' + implementation 'com.google.firebase:firebase-common:19.3.0' } } From 2cb1c9a9db81556195da17a02dd8814cdf40cb4b Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Tue, 19 Nov 2019 14:45:09 +0000 Subject: [PATCH 3/8] Bumps version, adds changelog --- packages/firebase_analytics/CHANGELOG.md | 5 +++++ packages/firebase_analytics/pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md index c1ab7ede376a..b344c746fd08 100644 --- a/packages/firebase_analytics/CHANGELOG.md +++ b/packages/firebase_analytics/CHANGELOG.md @@ -1,3 +1,8 @@ +## 5.1.0 + +* Update Firebase Analytics dependency on Android to 17.2.1 +* Updates Android gradle plugin dependency to 3.5.2 + ## 5.0.7 * Formatted `setCurrentScreen` documentation. diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml index 747a4a586e91..9200941539da 100755 --- a/packages/firebase_analytics/pubspec.yaml +++ b/packages/firebase_analytics/pubspec.yaml @@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen solution that provides insight on app usage and user engagement on Android and iOS. author: Flutter Team homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_analytics -version: 5.0.7 +version: 5.1.0 flutter: plugin: From ba8bce1bb18686223949a9090c76826263d1f28f Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Wed, 20 Nov 2019 09:27:04 +0000 Subject: [PATCH 4/8] Removes AndroidX constraint --- packages/firebase_analytics/CHANGELOG.md | 1 + packages/firebase_analytics/android/gradle.properties | 2 -- .../firebaseanalytics/FirebaseAnalyticsPlugin.java | 9 ++++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md index b344c746fd08..ac59b26ff2a8 100644 --- a/packages/firebase_analytics/CHANGELOG.md +++ b/packages/firebase_analytics/CHANGELOG.md @@ -2,6 +2,7 @@ * Update Firebase Analytics dependency on Android to 17.2.1 * Updates Android gradle plugin dependency to 3.5.2 +* Remove AndroidX constraint ## 5.0.7 diff --git a/packages/firebase_analytics/android/gradle.properties b/packages/firebase_analytics/android/gradle.properties index 94adc3a3f97a..8bd86f680510 100755 --- a/packages/firebase_analytics/android/gradle.properties +++ b/packages/firebase_analytics/android/gradle.properties @@ -1,3 +1 @@ org.gradle.jvmargs=-Xmx1536M -android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java b/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java index 03b5f4166e45..7ed2cf7c4635 100755 --- a/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java +++ b/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java @@ -7,7 +7,6 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; import com.google.firebase.FirebaseApp; import com.google.firebase.analytics.FirebaseAnalytics; import io.flutter.embedding.engine.plugins.FlutterPlugin; @@ -34,7 +33,7 @@ public static void registerWith(PluginRegistry.Registrar registrar) { } @Override - public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { + public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine( binding.getApplicationContext(), binding.getFlutterEngine().getDartExecutor()); } @@ -47,13 +46,13 @@ private void onAttachedToEngine(Context applicationContext, BinaryMessenger bina } @Override - public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { + public void onDetachedFromEngine(FlutterPluginBinding binding) { firebaseAnalytics = null; methodChannel = null; } @Override - public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) { + public void onAttachedToActivity(ActivityPluginBinding binding) { setActivity(binding.getActivity()); } @@ -63,7 +62,7 @@ public void onDetachedFromActivityForConfigChanges() { } @Override - public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) { + public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) { setActivity(binding.getActivity()); } From a31912f23302fdbda387070dc4bf93be8604a7f1 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Thu, 21 Nov 2019 09:33:48 +0000 Subject: [PATCH 5/8] Revert "Removes AndroidX constraint" This reverts commit ba8bce1bb18686223949a9090c76826263d1f28f. --- packages/firebase_analytics/CHANGELOG.md | 1 - packages/firebase_analytics/android/gradle.properties | 2 ++ .../firebaseanalytics/FirebaseAnalyticsPlugin.java | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md index ac59b26ff2a8..b344c746fd08 100644 --- a/packages/firebase_analytics/CHANGELOG.md +++ b/packages/firebase_analytics/CHANGELOG.md @@ -2,7 +2,6 @@ * Update Firebase Analytics dependency on Android to 17.2.1 * Updates Android gradle plugin dependency to 3.5.2 -* Remove AndroidX constraint ## 5.0.7 diff --git a/packages/firebase_analytics/android/gradle.properties b/packages/firebase_analytics/android/gradle.properties index 8bd86f680510..94adc3a3f97a 100755 --- a/packages/firebase_analytics/android/gradle.properties +++ b/packages/firebase_analytics/android/gradle.properties @@ -1 +1,3 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java b/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java index 7ed2cf7c4635..03b5f4166e45 100755 --- a/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java +++ b/packages/firebase_analytics/android/src/main/java/io/flutter/plugins/firebaseanalytics/FirebaseAnalyticsPlugin.java @@ -7,6 +7,7 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; +import androidx.annotation.NonNull; import com.google.firebase.FirebaseApp; import com.google.firebase.analytics.FirebaseAnalytics; import io.flutter.embedding.engine.plugins.FlutterPlugin; @@ -33,7 +34,7 @@ public static void registerWith(PluginRegistry.Registrar registrar) { } @Override - public void onAttachedToEngine(FlutterPluginBinding binding) { + public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) { onAttachedToEngine( binding.getApplicationContext(), binding.getFlutterEngine().getDartExecutor()); } @@ -46,13 +47,13 @@ private void onAttachedToEngine(Context applicationContext, BinaryMessenger bina } @Override - public void onDetachedFromEngine(FlutterPluginBinding binding) { + public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { firebaseAnalytics = null; methodChannel = null; } @Override - public void onAttachedToActivity(ActivityPluginBinding binding) { + public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) { setActivity(binding.getActivity()); } @@ -62,7 +63,7 @@ public void onDetachedFromActivityForConfigChanges() { } @Override - public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding) { + public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBinding binding) { setActivity(binding.getActivity()); } From 6aeb74557489c40577628fd5ba3384fffe5ffe00 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Thu, 21 Nov 2019 09:43:05 +0000 Subject: [PATCH 6/8] Adds androidx annotation reference to plugin explicitely --- packages/firebase_analytics/android/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle index abec2e338f4e..2e559daca8b1 100755 --- a/packages/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/android/build.gradle @@ -34,6 +34,7 @@ android { dependencies { api 'com.google.firebase:firebase-analytics:17.2.1' implementation 'com.google.firebase:firebase-common:19.3.0' + implementation 'androidx.annotation:annotation:1.1.0' } } From b2a1cdaa9a2568db339b731e2a29b6db2f1e8416 Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Wed, 4 Mar 2020 12:19:12 +0000 Subject: [PATCH 7/8] AGP & google-services updates --- packages/firebase_analytics/firebase_analytics/CHANGELOG.md | 1 + .../firebase_analytics/example/android/build.gradle | 4 ++-- .../example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/firebase_analytics/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/firebase_analytics/CHANGELOG.md index 50adb11f5c0a..5dc6641f27c3 100644 --- a/packages/firebase_analytics/firebase_analytics/CHANGELOG.md +++ b/packages/firebase_analytics/firebase_analytics/CHANGELOG.md @@ -2,6 +2,7 @@ * Update Firebase Analytics dependency on Android to 17.2.1 * Updates Android gradle plugin dependency to 3.6.1 +* Bumps Google Services Gradle Plugin in example to 4.3.3 ## 5.0.12 diff --git a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/build.gradle index af7defff8284..ff91f19da5b7 100755 --- a/packages/firebase_analytics/firebase_analytics/example/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/build.gradle @@ -6,8 +6,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' - classpath 'com.google.gms:google-services:4.3.0' + classpath 'com.android.tools.build:gradle:3.6.1' + classpath 'com.google.gms:google-services:4.3.3' } } diff --git a/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties index 418c06eaec91..a6eaae6675fa 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/firebase_analytics/firebase_analytics/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip From 2b32e4c72a8d74948709ae749841cf239d18566f Mon Sep 17 00:00:00 2001 From: Sebastian Roth Date: Wed, 4 Mar 2020 12:20:51 +0000 Subject: [PATCH 8/8] Bumps FA to 17.2.2 --- packages/firebase_analytics/firebase_analytics/CHANGELOG.md | 2 +- .../firebase_analytics/firebase_analytics/android/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_analytics/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/firebase_analytics/CHANGELOG.md index 5dc6641f27c3..15910063cf6a 100644 --- a/packages/firebase_analytics/firebase_analytics/CHANGELOG.md +++ b/packages/firebase_analytics/firebase_analytics/CHANGELOG.md @@ -1,6 +1,6 @@ ## 5.1.0 -* Update Firebase Analytics dependency on Android to 17.2.1 +* Update Firebase Analytics dependency on Android to 17.2.2 * Updates Android gradle plugin dependency to 3.6.1 * Bumps Google Services Gradle Plugin in example to 4.3.3 diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index fd0a5e147e31..1a0bc6269196 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -32,7 +32,7 @@ android { disable 'InvalidPackage' } dependencies { - api 'com.google.firebase:firebase-analytics:17.2.1' + api 'com.google.firebase:firebase-analytics:17.2.2' implementation 'com.google.firebase:firebase-common:19.3.0' implementation 'androidx.annotation:annotation:1.1.0' }