From 3e7baf458961e852bb3883719eab604574edfd99 Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Fri, 10 Sep 2021 11:00:37 +0100 Subject: [PATCH 01/13] Removed setTimestampsInSnapshotsEnabled() --- .../reallysmall/cordova/plugin/firestore/InitialiseHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/android/uk/co/reallysmall/cordova/plugin/firestore/InitialiseHandler.java b/src/android/uk/co/reallysmall/cordova/plugin/firestore/InitialiseHandler.java index 0c7284b..322fd7e 100644 --- a/src/android/uk/co/reallysmall/cordova/plugin/firestore/InitialiseHandler.java +++ b/src/android/uk/co/reallysmall/cordova/plugin/firestore/InitialiseHandler.java @@ -139,7 +139,6 @@ public boolean handle(final JSONArray args, CallbackContext callbackContext) { FirebaseFirestoreSettings settings = new FirebaseFirestoreSettings.Builder() .setPersistenceEnabled(persist) - .setTimestampsInSnapshotsEnabled(timestampsInSnapshots) .build(); firestorePlugin.getDatabase().setFirestoreSettings(settings); From 30a981a593d717c71f39e0f54f815a802eb858b3 Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 2 Nov 2021 14:03:19 +0000 Subject: [PATCH 02/13] Update plugin.xml --- plugin.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 42cc3ce..1713c26 100644 --- a/plugin.xml +++ b/plugin.xml @@ -42,7 +42,12 @@ - + + + + + + From d7aaeeb921ac1e5ac5a8068425fccd28310c113d Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 09:59:15 +0000 Subject: [PATCH 03/13] Update firestore.gradle Remove jcenter repo --- firestore.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/firestore.gradle b/firestore.gradle index df15f6d..21b454c 100644 --- a/firestore.gradle +++ b/firestore.gradle @@ -1,8 +1,7 @@ buildscript { repositories { - maven { url 'https://maven.google.com' } - mavenLocal() - jcenter() + maven { url 'https://maven.google.com' } + mavenLocal() } dependencies { classpath 'com.android.tools.build:gradle:3.3.2' From 424cc9af92f3512a2a3c9d98ccd271d0f56b62e9 Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 11:41:05 +0000 Subject: [PATCH 04/13] Update firestore.gradle Update dependencies for gradle and google-services --- firestore.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/firestore.gradle b/firestore.gradle index 21b454c..60bdc15 100644 --- a/firestore.gradle +++ b/firestore.gradle @@ -2,9 +2,9 @@ buildscript { repositories { maven { url 'https://maven.google.com' } mavenLocal() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' - classpath 'com.google.gms:google-services:4.2.0' - } + } + dependencies { + classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.google.gms:google-services:4.3.10' + } } From 3dfbd72baf0a66ec99a94cc2e04eaecead7e5673 Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 12:58:46 +0000 Subject: [PATCH 05/13] Update firestore.gradle --- firestore.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firestore.gradle b/firestore.gradle index 60bdc15..9ccacf3 100644 --- a/firestore.gradle +++ b/firestore.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.5.1' classpath 'com.google.gms:google-services:4.3.10' } } From 2d32ad3cd5e8f8a4faed23d0ee79b67ac8ff6c23 Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 13:16:40 +0000 Subject: [PATCH 06/13] Update plugin.xml "ANDROID_GSON_VERSION": "2.9.0" --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 1713c26..8d09d9c 100644 --- a/plugin.xml +++ b/plugin.xml @@ -49,7 +49,7 @@ - + From f49ec620bee8a07f9297273dea0d0ee88899f3a2 Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 13:28:37 +0000 Subject: [PATCH 07/13] Update plugin.xml --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 8d09d9c..12354d6 100644 --- a/plugin.xml +++ b/plugin.xml @@ -44,7 +44,7 @@ - + From b5d5bfb0e6931ad4e09916a7271bbe56fffb8746 Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 13:53:50 +0000 Subject: [PATCH 08/13] Update firestore.gradle --- firestore.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firestore.gradle b/firestore.gradle index 9ccacf3..a34d0d1 100644 --- a/firestore.gradle +++ b/firestore.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:7.5.1' + classpath 'com.android.tools.build:gradle:7.4.0' classpath 'com.google.gms:google-services:4.3.10' } } From bea718c3b5b20237ae86d7e359b2021bb8fb1330 Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 13:55:51 +0000 Subject: [PATCH 09/13] Update firestore.gradle --- firestore.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firestore.gradle b/firestore.gradle index a34d0d1..edbc9aa 100644 --- a/firestore.gradle +++ b/firestore.gradle @@ -5,6 +5,6 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.0' - classpath 'com.google.gms:google-services:4.3.10' + classpath 'com.google.gms:google-services:4.3.14' } } From 561df99523fda043501322759157fb1b169e3adb Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 14:07:08 +0000 Subject: [PATCH 10/13] Update firestore.gradle --- firestore.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firestore.gradle b/firestore.gradle index edbc9aa..a222ab7 100644 --- a/firestore.gradle +++ b/firestore.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:7.3.1' classpath 'com.google.gms:google-services:4.3.14' } } From 247c48bc5fb7358bb3b8bcadb78eb25640a0a608 Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 14:54:23 +0000 Subject: [PATCH 11/13] Update firestore.gradle --- firestore.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firestore.gradle b/firestore.gradle index a222ab7..f231588 100644 --- a/firestore.gradle +++ b/firestore.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.2.1' classpath 'com.google.gms:google-services:4.3.14' } } From 798bb53a455bc92eed358c0f46f350cecfdaa0ed Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Tue, 1 Nov 2022 14:55:28 +0000 Subject: [PATCH 12/13] Update firestore.gradle --- firestore.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firestore.gradle b/firestore.gradle index f231588..8d8591b 100644 --- a/firestore.gradle +++ b/firestore.gradle @@ -5,6 +5,6 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.2.1' - classpath 'com.google.gms:google-services:4.3.14' + classpath 'com.google.gms:google-services:4.3.10' } } From c308066f069263a29bd11b30c0d16a0e296b30cc Mon Sep 17 00:00:00 2001 From: Servicesoft <42579032+servicesoftuk@users.noreply.github.com> Date: Wed, 2 Nov 2022 11:35:47 +0000 Subject: [PATCH 13/13] Update firestore.gradle --- firestore.gradle | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/firestore.gradle b/firestore.gradle index 8d8591b..3a20208 100644 --- a/firestore.gradle +++ b/firestore.gradle @@ -1,10 +1,32 @@ buildscript { - repositories { - maven { url 'https://maven.google.com' } - mavenLocal() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' - classpath 'com.google.gms:google-services:4.3.10' - } + repositories { + google() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.google.gms:google-services:4.3.10' + } } +repositories { + mavenCentral() + maven { + url "https://maven.google.com" + } +} +dependencies { + implementation "com.google.firebase:firebase-core:18.0.0" + implementation "androidx.appcompat:appcompat:1.3.1" +} + +cdvPluginPostBuildExtras.add({ + afterEvaluate { + rootProject.subprojects { + if (name == "app") { + if (!plugins.hasPlugin('com.google.gms.google-services')) { + apply plugin: com.google.gms.googleservices.GoogleServicesPlugin + } + } + } + } +})