From decfae7504fcc7310db93f24b3cd8562846abde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Corre=CC=82a?= Date: Tue, 19 Apr 2022 13:56:50 +0100 Subject: [PATCH 1/2] fix: added hook to modify build.grade --- hooks/android/build_gradle_add_dependency.js | 50 ++++++++++++++++++++ hooks/{ => ios}/iOSCopyPreferences.js | 0 plugin.xml | 4 +- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 hooks/android/build_gradle_add_dependency.js rename hooks/{ => ios}/iOSCopyPreferences.js (100%) diff --git a/hooks/android/build_gradle_add_dependency.js b/hooks/android/build_gradle_add_dependency.js new file mode 100644 index 0000000..9cb2dcf --- /dev/null +++ b/hooks/android/build_gradle_add_dependency.js @@ -0,0 +1,50 @@ +#!/usr/bin/env node + +module.exports = function(ctx) { + var fs = require('fs'), + os = require("os"), + readline = require("readline"), + deferral = require('q').defer(); + +var googleServicesStr = "if (project.extensions.findByName('googleServices') == null) { apply plugin: 'com.google.gms.google-services' }" +var googleServicesStrExists = false +var classpathsStrToVerify = "com.google.gms:google-services:4.3.10" +var classpathsStr = '\t\tclasspath "com.google.gms:google-services:4.3.10"' +var rootBuildGradlePath = "platforms/android/build.gradle" +var appBuildGradlePath = "platforms/android/app/build.gradle" + +var lineReader = readline.createInterface({ + terminal: false, + input : fs.createReadStream(rootBuildGradlePath) +}); +lineReader.on("line", function(line) { + if (!line.includes(classpathsStrToVerify)) { + fs.appendFileSync('./build.gradle', line.toString() + os.EOL); + if (/.*\ dependencies \{.*/.test(line)) { + fs.appendFileSync('./build.gradle', classpathsStr + os.EOL); + } + } + +}).on("close", function () { + fs.rename('./build.gradle', rootBuildGradlePath, deferral.resolve); +}); + +var lineReaderApp = readline.createInterface({ + terminal: false, + input : fs.createReadStream(appBuildGradlePath) +}); +lineReaderApp.on("line", function (line) { + if (line.includes(googleServicesStr)) { + googleServicesStrExists = true; + } +}); +lineReaderApp.on("close", function () { + if (!googleServicesStrExists) { + fs.appendFileSync('./' + appBuildGradlePath, googleServicesStr + os.EOL); + fs.rename('./' + appBuildGradlePath, appBuildGradlePath, deferral.resolve); + } + +}); + +return deferral.promise; +}; diff --git a/hooks/iOSCopyPreferences.js b/hooks/ios/iOSCopyPreferences.js similarity index 100% rename from hooks/iOSCopyPreferences.js rename to hooks/ios/iOSCopyPreferences.js diff --git a/plugin.xml b/plugin.xml index 594a7af..fb06d43 100644 --- a/plugin.xml +++ b/plugin.xml @@ -29,7 +29,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" - + @@ -69,6 +69,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" + + From e0e099894c34547ad97266608992cd834846fdda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Corre=CC=82a?= Date: Tue, 19 Apr 2022 14:58:14 +0100 Subject: [PATCH 2/2] chore: changelog updated and raise version to 5.0.0-OS3 --- CHANGELOG.md | 4 ++++ package.json | 2 +- plugin.xml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31375f3..14be6d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The changes documented here do not include those from the original repository. ## [Unreleased] +## 5.0.0-OS3 +## 2022-04-19 +- Hook to add google services dependency to build.gradle. [RMET-1497](https://outsystemsrd.atlassian.net/browse/RMET-1497) + ### 2021-04-18 - Added hook to enable the usage of a dynamic message for the NSUserTrackingUsageDescription field for iOS (https://outsystemsrd.atlassian.net/browse/RMET-1496) diff --git a/package.json b/package.json index f6c9ae5..364659c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova-plugin-firebase-analytics", - "version": "5.0.0-OS2", + "version": "5.0.0-OS3", "description": "Cordova plugin for Firebase Analytics", "cordova": { "id": "cordova-plugin-firebase-analytics", diff --git a/plugin.xml b/plugin.xml index fb06d43..9f24077 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,7 +1,7 @@ + version="5.0.0-OS3"> FirebaseAnalyticsPlugin Cordova plugin for Firebase Analytics