From 7da9664141c4d6b5353314d00d0b9d54778cceed Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Fri, 13 Sep 2024 20:29:58 -0300 Subject: [PATCH 1/2] RMET-3608 FB Analytics - Update dependency to Firebase Analytics Android SDK (#40) * feat: use Firebase Android BOM library to set the version of FB Analytics Context: According to the documentation, this is the recommended way of controlling Firebase library versions. This way, using the Firebase Android BOM, an app with multiple Firebase Android libraries will always use compatible versions of these libraries. References: https://outsystemsrd.atlassian.net/browse/RMET-3608 * fix: declare Firebase dependencies in build.gradle file References: https://outsystemsrd.atlassian.net/browse/RMET-3608 * test: use framework to set firebase-analytics version References: https://outsystemsrd.atlassian.net/browse/RMET-3608 * refactor: declare Firebase dependencies in build.gradle file References: https://outsystemsrd.atlassian.net/browse/RMET-3608 * fix: enable Kotlin Context: This is necessary for MABS 9. We currently say that the current version of the plugin works with MABS 9 and MAS 10, but it actually doesn't work with MABS 9 because we use Kotlin code but do not enable the Kotlin plugin. References: https://outsystemsrd.atlassian.net/browse/RMET-3608 * test: enable AndroidX * chore: revert previous commit * fix: enable Kotlin Context: This is necessary for MABS 9. We currently say that the current version of the plugin works with MABS 9 and MAS 10, but it actually doesn't work with MABS 9 because we use Kotlin code but do not enable the Kotlin plugin. References: https://outsystemsrd.atlassian.net/browse/RMET-3608 * fix: revert previous commit * test: include FB Analytics using framework * test: enable Kotlin * refactor: include FB dependencies in build.gradle References: https://outsystemsrd.atlassian.net/browse/RMET-3608 * chore: revert previous commit that added Kotlin * chore: update changelog https://outsystemsrd.atlassian.net/browse/RMET-3608 --- CHANGELOG.md | 3 +++ build.gradle | 5 +++++ plugin.xml | 2 -- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a10ec67..604d0438 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 The changes documented here do not include those from the original repository. +## Unreleased +- Android | Update dependency to Firebase Analytics Android library (https://outsystemsrd.atlassian.net/browse/RMET-3608). + ## 5.0.0-OS13 - Fix: Make `ANALYTICS_COLLECTION_ENABLED` configurable (https://outsystemsrd.atlassian.net/browse/RMET-3503). diff --git a/build.gradle b/build.gradle index 162cbf30..00b61827 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,11 @@ buildscript { } } +dependencies { + implementation platform('com.google.firebase:firebase-bom:33.2.0') + implementation("com.google.firebase:firebase-analytics") +} + // use postBuildExtras to make sure the plugin is applied after // cdvPluginPostBuildExtras. Therefore if googleServices is added // to cdvPluginPostBuildExtras somewhere else, the plugin execution diff --git a/plugin.xml b/plugin.xml index 78cbcc57..4a434ca9 100644 --- a/plugin.xml +++ b/plugin.xml @@ -82,7 +82,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" - @@ -103,7 +102,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" - From 0a66a732b006bc640d789e3cbf723a1010ad1002 Mon Sep 17 00:00:00 2001 From: Alexandre Jacinto Date: Tue, 17 Sep 2024 12:18:54 +0100 Subject: [PATCH 2/2] chore(release): raise to version 5.0.0-OS14 References: https://outsystemsrd.atlassian.net/browse/RMET-3608 --- CHANGELOG.md | 5 ++++- package.json | 2 +- plugin.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 604d0438..9765c5ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 The changes documented here do not include those from the original repository. -## Unreleased +## 5.0.0-OS14 + - Android | Update dependency to Firebase Analytics Android library (https://outsystemsrd.atlassian.net/browse/RMET-3608). ## 5.0.0-OS13 + - Fix: Make `ANALYTICS_COLLECTION_ENABLED` configurable (https://outsystemsrd.atlassian.net/browse/RMET-3503). ## 5.0.0-OS12 + - Chore: Update `FirebaseAnalytics` iOS pod to version `10.23.0` (https://outsystemsrd.atlassian.net/browse/RMET-3274). ## 5.0.0-OS11 diff --git a/package.json b/package.json index c165b514..22640780 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-firebase-analytics", - "version": "5.0.0-OS13", + "version": "5.0.0-OS14", "description": "Cordova plugin for Firebase Analytics", "cordova": { "id": "cordova-plugin-firebase-analytics", diff --git a/plugin.xml b/plugin.xml index 4a434ca9..d48f9633 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,7 +1,7 @@ + version="5.0.0-OS14"> FirebaseAnalyticsPlugin Cordova plugin for Firebase Analytics