3.0.0

.editorconfig

@@ -11,7 +11,7 @@ trim_trailing_whitespace = true
 
 [{package.json,.travis.yml}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [{plugin.xml,Makefile}]
 indent_style = tab

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem.
 If applicable, provide console logs showing the errors being reported.
 
 **Plugin Version**
-Run `cordova plugin list` to find out what version of cordova-plugin-firebase you are running with
+Run `cordova plugin list` to find out what version of `cordova-plugin-firebase-lib` you are running with
 
 **Desktop (please complete the following information):**
  - OS: [e.g. iOS]

.gitignore

@@ -6,4 +6,3 @@
 .build-browser
 package-lock.json
 node_modules
-cordova-plugin-firebase.code-workspace

CHANGELOG.md

@@ -1,73 +1,16 @@
-# Version 2.0.5
+# Change Log
 
-### Bug Fixes
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/issues/897">#897</a>: Fixed issue with after_prepare hook not copying required files
+## Version 3.0.0
 
-# Version 2.0.4
+First version under [Wiz Panda](https://www.wizpanda.com/).
 
-### Bug Fixes
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/issues/866">#866</a>: Fixed issue with loading .plist file on some iOS devices
+1. Cordova@9 support
+2. Fixes issues cause by Firebase SDK updates on [5 April 2019](https://firebase.google.com/support/release-notes/android#update_-_april_05_2019).
+Thanks to [Dave Alden](https://github.com/dpa99c) for [commit](https://github.com/wizpanda/cordova-plugin-firebase-lib/commit/46a7bd1c06434fb4c5a72c2c20ae5d951a2e37f4)
+3. Remove obsolete <service> entry for FirebasePluginInstanceIDService. Thanks to [Dave Alden](https://github.com/dpa99c) for [commit](https://github.com/wizpanda/cordova-plugin-firebase-lib/commit/eee2cfe845e6c2466d4c7fcb69d70c0c8840ea6b)
+4. Remove unnecessary extra <config-file> block which can lead to race condition. Thanks to [Dave Alden](https://github.com/dpa99c) for [commit](https://github.com/wizpanda/cordova-plugin-firebase-lib/commit/17eb7c46176d5ad28fc93b53a2c49d9e6ed1888b)
+5. Remove redundant build-extras.gradle. Thanks to [Dave Alden](https://github.com/dpa99c) for [commit](https://github.com/wizpanda/cordova-plugin-firebase-lib/commit/289706fc30fe848de082c468440c91ffecdce97d)
 
-# Version 2.0.3
+## For older versions
 
-### Features
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/874">#874</a>: Added new api `setCrashlyticsUserId` which allows setting Crashlytics user identifier
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/861">#861</a>: Updated `verifyPhoneNumber` api on android to add the following properties to the returned object:
-   - `code` - sms code
-   - `verified` - whether or not the verification was successful
-
-### Bug Fixes
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/issues/869">#869</a>: Replace add/remove hooks with install/uninstall hooks to ensure proper configuration of the plugin
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/870">#870</a>: Add error handling to `fetch` api on iOS
-
-# Version 2.0.2
-
-### Bug Fixes
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/issues/837">#837</a>: Fixed android build
-
-# Version 2.0.1
-
-### Bug Fixes
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/836">#836</a>: Fixed Crashlytics on iOS
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/830">#830</a>: Fixed initialization of firebase services
-
-# Version 2.0.0
-
-### Features
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/issues/796">#796</a>: Update Firebase SDK Version to 5.x
-
-### Bug Fixes
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/issues/822">#822</a>: Can't use initFirebase() on 1.1.3 [Firebase isn't initialized]
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/issues/827">#827</a>: doc missing: initFirebase call needed before anything
-- <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/824">#824</a>: Removed initRemoteConfig method
-
-# Version 1.1.4 (deprecated)
-
-This version has been deprecated due to complications with PR <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/784">#784</a>
-
-# Version 1.1.3 (deprecated)
-
-This version has been deprecated due to complications with PR <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/784">#784</a>
-
-# Version 1.1.2 (deprecated)
-
-This version has been deprecated due to complications with PR <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/784">#784</a>
-
-# Version 1.1.1 (deprecated)
-
-This version has been deprecated due to complications with PR <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/784">#784</a>
-
-# Version 1.1.0 (deprecated)
-
-This version has been deprecated due to complications with PR <a href="https://github.com/arnesson/cordova-plugin-firebase/pull/784">#784</a>
-
-# Version 1.0.5
-
-To force cordova to use this version, add the following to your project's config.xml:
-```
-<plugin name="cordova-plugin-firebase" spec="1.0.5" />
-```
-or by running:
-```
-cordova plugin add [email protected] --save
-```
+See the https://github.com/arnesson/cordova-plugin-firebase/blob/v2.0.5/CHANGELOG.md

README.md

@@ -1,21 +1,22 @@
-[![Build Status](https://travis-ci.org/arnesson/cordova-plugin-firebase.svg?branch=master)](https://travis-ci.org/arnesson/cordova-plugin-firebase)
+# Cordova Firebase Plugin2
 
-# cordova-plugin-firebase
-This plugin brings push notifications, analytics, event tracking, crash reporting and more from Google Firebase to your Cordova project!  Android and iOS supported.
+This plugin brings push notifications, analytics, event tracking, crash reporting and more from Google Firebase to your Cordova project!
 
 ## Supported Cordova Versions
-- cordova: `>= 6`
-- cordova-android: `>= 6.4`
-- cordova-ios: `>= 4`
+- cordova: `>= 7`
+- cordova-android: `>= 7.0.0`
+- cordova-ios: `>= 4.5.5`
 
 ## Installation
+
 Install the plugin by adding it to your project's config.xml:
 ```
-<plugin name="cordova-plugin-firebase" spec="^2.0.0" />
+<plugin name="cordova-plugin-firebase-lib" spec="^3.0.0" />
 ```
+
 or by running:
 ```
-cordova plugin add cordova-plugin-firebase --save
+cordova plugin add cordova-plugin-firebase-lib --save
 ```
 
 ### Guides

bump-version.js

@@ -4,5 +4,5 @@ const fs = require('fs');
 const version = require('./package.json').version;
 
 let data = fs.readFileSync('./plugin.xml', "utf8");
-data = data.replace(/plugin id="cordova-plugin-firebase" version="[^"]+"/, `plugin id="cordova-plugin-firebase" version="${version}"`);
+data = data.replace(/plugin id="cordova-plugin-firebase-lib" version="[^"]+"/, `plugin id="cordova-plugin-firebase-lib" version="${version}"`);
 fs.writeFileSync('./plugin.xml', data);

package.json

@@ -1,17 +1,18 @@
 {
+  "name": "cordova-plugin-firebase-lib",
+  "version": "3.0.0",
   "author": {
-    "name": "Robert Arnesson"
+    "name": "Wiz Panda Techno Solutions",
+    "url": "https://www.wizpanda.com/"
   },
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/arnesson/cordova-plugin-firebase"
+    "url": "https://github.com/wizpanda/cordova-plugin-firebase-lib"
   },
-  "name": "cordova-plugin-firebase",
-  "version": "2.0.5",
   "description": "Cordova plugin for Google Firebase",
   "cordova": {
-    "id": "cordova-plugin-firebase",
+    "id": "cordova-plugin-firebase-lib",
     "platforms": [
       "android",
       "ios",

plugin.xml

@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-firebase" version="2.0.5"
+<plugin id="cordova-plugin-firebase-lib" version="3.0.0"
 xmlns="http://apache.org/cordova/ns/plugins/1.0"
 xmlns:android="http://schemas.android.com/apk/res/android">
 	<name>Google Firebase Plugin</name>
 
 	<license>MIT</license>
 
 	<engines>
-		<engine name="cordova" version=">=3.2.0" />
+		<engine name="cordova" version=">=7.0.0"/>
 	</engines>
 
 	<platform name="android">

scripts/after_prepare.js

@@ -3,7 +3,7 @@
 'use strict';
 
 /**
- * This hook makes sure projects using [cordova-plugin-firebase](https://github.com/arnesson/cordova-plugin-firebase)
+ * This hook makes sure projects using [cordova-plugin-firebase-lib](https://github.com/wizpanda/cordova-plugin-firebase-lib)
  * will build properly and have the required key files copied to the proper destinations when the app is build on Ionic Cloud using the package command.
  * Credits: https://github.com/arnesson.
  */

scripts/android/helper.js

@@ -23,8 +23,8 @@ function addDependencies(buildGradle) {
   var whitespace = match[1];
 
   // modify the line to add the necessary dependencies
-  var googlePlayDependency = whitespace + 'classpath \'com.google.gms:google-services:4.2.0\' // google-services dependency from cordova-plugin-firebase';
-  var fabricDependency = whitespace + 'classpath \'io.fabric.tools:gradle:1.25.4\' // fabric dependency from cordova-plugin-firebase'
+  var googlePlayDependency = whitespace + 'classpath \'com.google.gms:google-services:4.2.0\' // google-services dependency from cordova-plugin-firebase-lib';
+  var fabricDependency = whitespace + 'classpath \'io.fabric.tools:gradle:1.25.4\' // fabric dependency from cordova-plugin-firebase-lib';
   var modifiedLine = match[0] + '\n' + googlePlayDependency + '\n' + fabricDependency;
 
   // modify the actual line
@@ -41,7 +41,7 @@ function addRepos(buildGradle) {
 
   // modify the line to add the necessary repo
   // Crashlytics goes under buildscripts which is the first grouping in the file
-  var fabricMavenRepo = whitespace + 'maven { url \'https://maven.fabric.io/public\' } // Fabrics Maven repository from cordova-plugin-firebase'
+  var fabricMavenRepo = whitespace + 'maven { url \'https://maven.fabric.io/public\' } // Fabrics Maven repository from cordova-plugin-firebase-lib'
   var modifiedLine = match[0] + '\n' + fabricMavenRepo;
 
   // modify the actual line
@@ -56,7 +56,7 @@ function addRepos(buildGradle) {
 
     // Add google() to the allprojects section of the string
     match = secondHalfOfFile.match(/^(\s*)jcenter\(\)/m);
-    var googlesMavenRepo = whitespace + 'google() // Google\'s Maven repository from cordova-plugin-firebase';
+    var googlesMavenRepo = whitespace + 'google() // Google\'s Maven repository from cordova-plugin-firebase-lib';
     modifiedLine = match[0] + '\n' + googlesMavenRepo;
     // modify the part of the string that is after 'allprojects'
     secondHalfOfFile = secondHalfOfFile.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
@@ -66,7 +66,7 @@ function addRepos(buildGradle) {
   } else {
     // this should not happen, but if it does, we should try to add the dependency to the buildscript
     match = buildGradle.match(/^(\s*)jcenter\(\)/m);
-    var googlesMavenRepo = whitespace + 'google() // Google\'s Maven repository from cordova-plugin-firebase';
+    var googlesMavenRepo = whitespace + 'google() // Google\'s Maven repository from cordova-plugin-firebase-lib';
     modifiedLine = match[0] + '\n' + googlesMavenRepo;
     // modify the part of the string that is after 'allprojects'
     buildGradle = buildGradle.replace(/^(\s*)jcenter\(\)/m, modifiedLine);
@@ -111,7 +111,7 @@ module.exports = {
     var buildGradle = readRootBuildGradle();
 
     // remove any lines we added
-    buildGradle = buildGradle.replace(/(?:^|\r?\n)(.*)cordova-plugin-firebase*?(?=$|\r?\n)/g, '');
+    buildGradle = buildGradle.replace(/(?:^|\r?\n)(.*)cordova-plugin-firebase-lib*?(?=$|\r?\n)/g, '');
 
     writeRootBuildGradle(buildGradle);
   }

scripts/lib/utilities.js

@@ -33,7 +33,7 @@ module.exports = {
      * The ID of the plugin; this should match the ID in plugin.xml.
      */
   getPluginId: function () {
-    return "cordova-plugin-firebase";
+    return "cordova-plugin-firebase-lib";
   },
 
   copyKey: function (platform) {