From 91dec18d313be073171322760721d0d3d0a7762b Mon Sep 17 00:00:00 2001 From: EddyVerbruggen Date: Thu, 12 Jul 2018 22:05:01 +0200 Subject: [PATCH] bump --- .gitignore | 2 +- CHANGELOG.md | 4 ++++ src/scripts/postinstall.js | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f139379b..8cb18a26 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ src/platforms/android/include.gradle !src/platforms/web/typings/firebase-webapi.d.ts !src/platforms/ios/typings/*.d.ts !src/platforms/android/typings/**/*.d.ts -!src/scripts/entitlements*.js +!src/scripts/*.js !demo/karma.conf.js demo/*.d.ts demo-ng/*.d.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 9df27920..d999b789 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ [Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios) [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android) +## 6.4.1 (2018, July 13) +[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/64?closed=1) + + ## 6.4.0 (2018, July 3) [Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/63?closed=1) diff --git a/src/scripts/postinstall.js b/src/scripts/postinstall.js index 0338f232..46c71902 100644 --- a/src/scripts/postinstall.js +++ b/src/scripts/postinstall.js @@ -3422,10 +3422,16 @@ module.exports = function($logger, $projectData, hookArgs) { if (hookArgs.platform.toLowerCase() === 'android') { var sourceGoogleJson = path.join($projectData.appResourcesDirectoryPath, "Android", "google-services.json"); var destinationGoogleJson = path.join($projectData.platformsDir, "android", "app", "google-services.json"); + var destinationGoogleJsonAlt = path.join($projectData.platformsDir, "android", "google-services.json"); if (fs.existsSync(sourceGoogleJson) && fs.existsSync(path.dirname(destinationGoogleJson))) { $logger.out("Copy " + sourceGoogleJson + " to " + destinationGoogleJson + "."); fs.writeFileSync(destinationGoogleJson, fs.readFileSync(sourceGoogleJson)); resolve(); + } else if (fs.existsSync(sourceGoogleJson) && fs.existsSync(path.dirname(destinationGoogleJsonAlt))) { + // NativeScript < 4 doesn't have the 'app' folder + $logger.out("Copy " + sourceGoogleJson + " to " + destinationGoogleJsonAlt + "."); + fs.writeFileSync(destinationGoogleJsonAlt, fs.readFileSync(sourceGoogleJson)); + resolve(); } else { $logger.warn("Unable to copy google-services.json."); reject();