From c5298add8992ce798baa471cf6267b91954a5a3b Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Mon, 5 Apr 2021 15:22:48 +0100 Subject: [PATCH 01/12] fix: lower analytics framework version Lowering version so that the google-play-services used is a smaller one. References: https://outsystemsrd.atlassian.net/browse/RMET-580 --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index d42834d..b7b9165 100644 --- a/plugin.xml +++ b/plugin.xml @@ -57,7 +57,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" - + From bd2b7d9659fe5d9f9abdf631a2d90d897e41dad8 Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Mon, 5 Apr 2021 16:19:42 +0100 Subject: [PATCH 02/12] fix: lower analytics version to 17.0.+ --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index b7b9165..23d6a8f 100644 --- a/plugin.xml +++ b/plugin.xml @@ -57,7 +57,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" - + From 6f063f0ab8fba0958260d498d17c05f00892fdee Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Mon, 5 Apr 2021 16:41:27 +0100 Subject: [PATCH 03/12] fix: lower analytics framework version --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 23d6a8f..db6d0cf 100644 --- a/plugin.xml +++ b/plugin.xml @@ -57,7 +57,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" - + From 50f484d1aff1da23ce0cf65c8e99bf63e610c381 Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Mon, 5 Apr 2021 17:37:01 +0100 Subject: [PATCH 04/12] fix: lower firebase analytics version --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index db6d0cf..e45b14d 100644 --- a/plugin.xml +++ b/plugin.xml @@ -57,7 +57,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" - + From 67e51610b1445b11e71cb36e4e084f3bb991c7e9 Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Tue, 6 Apr 2021 15:32:57 +0100 Subject: [PATCH 05/12] fix: upgrade firebase analytics version --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index e45b14d..d42834d 100644 --- a/plugin.xml +++ b/plugin.xml @@ -57,7 +57,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" - + From 6e8198e07e851f86e19e34a1d31037455cb84a44 Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Tue, 6 Apr 2021 17:34:56 +0100 Subject: [PATCH 06/12] comment line for testing --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c7a52d8..cd1676c 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,6 @@ ext.postBuildExtras = { if (project.extensions.findByName('googleServices') == null) { // apply plugin: 'com.google.gms.google-services' // class must be used instead of id(string) to be able to apply plugin from non-root gradle file - apply plugin: com.google.gms.googleservices.GoogleServicesPlugin + //apply plugin: com.google.gms.googleservices.GoogleServicesPlugin } } From 16ee12b6e993fdc61fb0f3e7c0ad6d720b897c70 Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Tue, 6 Apr 2021 18:03:12 +0100 Subject: [PATCH 07/12] fix: use preference to enable google services instead of build.gradle file --- build.gradle | 2 +- plugin.xml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index cd1676c..c7a52d8 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,6 @@ ext.postBuildExtras = { if (project.extensions.findByName('googleServices') == null) { // apply plugin: 'com.google.gms.google-services' // class must be used instead of id(string) to be able to apply plugin from non-root gradle file - //apply plugin: com.google.gms.googleservices.GoogleServicesPlugin + apply plugin: com.google.gms.googleservices.GoogleServicesPlugin } } diff --git a/plugin.xml b/plugin.xml index d42834d..813d3ee 100644 --- a/plugin.xml +++ b/plugin.xml @@ -75,12 +75,17 @@ xmlns:android="http://schemas.android.com/apk/res/android" + + + + + - + From 8e7638f79e6cf5d70a0258ba40f865ed7e76728e Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Tue, 6 Apr 2021 18:08:08 +0100 Subject: [PATCH 08/12] comment line for troubleshoot --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c7a52d8..cd1676c 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,6 @@ ext.postBuildExtras = { if (project.extensions.findByName('googleServices') == null) { // apply plugin: 'com.google.gms.google-services' // class must be used instead of id(string) to be able to apply plugin from non-root gradle file - apply plugin: com.google.gms.googleservices.GoogleServicesPlugin + //apply plugin: com.google.gms.googleservices.GoogleServicesPlugin } } From 491e5d66a3bbea5ec8fc2bcda781679020ff3f4a Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Tue, 6 Apr 2021 18:13:10 +0100 Subject: [PATCH 09/12] fix: revert previous commits --- plugin.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugin.xml b/plugin.xml index 813d3ee..d42834d 100644 --- a/plugin.xml +++ b/plugin.xml @@ -75,17 +75,12 @@ xmlns:android="http://schemas.android.com/apk/res/android" - - - - - - + From 1a7bedd5f67b16bb67d348e3ce64cad40e8b41a3 Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Tue, 6 Apr 2021 18:41:02 +0100 Subject: [PATCH 10/12] uncomment line --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cd1676c..c7a52d8 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,6 @@ ext.postBuildExtras = { if (project.extensions.findByName('googleServices') == null) { // apply plugin: 'com.google.gms.google-services' // class must be used instead of id(string) to be able to apply plugin from non-root gradle file - //apply plugin: com.google.gms.googleservices.GoogleServicesPlugin + apply plugin: com.google.gms.googleservices.GoogleServicesPlugin } } From b8b2daf07ec54a9617c224b5a191a9cfe574922e Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Wed, 7 Apr 2021 18:54:00 +0100 Subject: [PATCH 11/12] fix: disable version check for google services, for testing purposes --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index c7a52d8..e9f858e 100644 --- a/build.gradle +++ b/build.gradle @@ -20,5 +20,6 @@ ext.postBuildExtras = { // apply plugin: 'com.google.gms.google-services' // class must be used instead of id(string) to be able to apply plugin from non-root gradle file apply plugin: com.google.gms.googleservices.GoogleServicesPlugin + googleServices.disableVersionCheck = true } } From a8fef6a4bb6a46d960fddcc8a25dfd28e29b6781 Mon Sep 17 00:00:00 2001 From: alexgerardojacinto Date: Thu, 8 Apr 2021 16:54:22 +0100 Subject: [PATCH 12/12] chore: update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33dfe1e..c474274 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ The changes documented here do not include those from the original repository. ## [Unreleased] +## 2021-04-08 +- Fix: Fixed Android MABS builds for Firebase Analytics being used with OneSignal (https://outsystemsrd.atlassian.net/browse/RMET-580) + ## 2021-03-29 - Fix: Fixed hook unzipAndCopyConfigurations