Supporting cordova-cli@9 or cordova-lib@9

.travis.yml

@@ -26,7 +26,7 @@ matrix:
  - android-sdk-preview-license-.+
  - android-sdk-license-.+
  - google-gdk-license-.+
- env: CORDOVA_VERSION="6.5.0" CORDOVA_PLATFORM="android" CORDOVA_PLATFORM_VERSION="6.4.0"
+ env: CORDOVA_VERSION="9.0.0" CORDOVA_PLATFORM="android" CORDOVA_PLATFORM_VERSION="8.0.0"
 
  - os: linux
  sudo: false

README.md

@@ -42,6 +42,10 @@ Download your Firebase configuration files, GoogleService-Info.plist for iOS and
 ### PhoneGap Build
 Hooks do not work with PhoneGap Build. This means you will have to manually make sure the configuration files are included. One way to do that is to make a private fork of this plugin and replace the placeholder config files (see `src/ios` and `src/android`) with your actual ones, as well as hard coding your app id and api key in `plugin.xml`.
 
+### cordova-lib@9 support
+If you are using `cordova-cli@9` (i.e. `cordova-lib@9`) then you might need to install the `xcode` npm module dependency separately. To 
+do that, just run this command `npm i xcode --save-dev` in your app.
+
 ### Google Play Services
 Your build may fail if you are installing multiple plugins that use Google Play Services. This is caused by the plugins installing different versions of the Google Play Services library. This can be resolved by installing [cordova-android-play-services-gradle-release](https://github.com/dpa99c/cordova-android-play-services-gradle-release).
 

package.json

@@ -32,7 +32,7 @@
  "version": "node ./bump-version.js && git add -A plugin.xml",
  "postversion": "git push && git push --tags && npm publish --verbose",
  "test": "npm run test:ios && npm run test:android && npm run test:browser",
- "test:android": "npm run test:cordova@6.5.0:android@6.4.0 && npm run test:cordova@7.1.0:android@7.1.0 && npm run test:cordova@8.0.0:android@7.1.0",
+ "test:android": "npm run test:cordova@7.1.0:android@7.1.0 && npm run test:cordova@8.0.0:android@7.1.0 && npm run test:cordova@9.0.0:android@8.0.0",
  "test:browser": "npm run test:cordova@6.5.0:browser@5.0.3 && npm run test:cordova@7.1.0:browser@5.0.3 && npm run test:cordova@8.0.0:browser@5.0.3",
  "test:ios": "npm run test:cordova@6.5.0:ios@4.5.4 && npm run test:cordova@7.1.0:ios@4.5.4 && npm run test:cordova@8.0.0:ios@4.5.4",
  "test:cordova@6.5.0:ios@4.5.4": "bash ./test/test-default.sh 6.5.0 ios 4.5.4",
@@ -45,5 +45,7 @@
  "test:cordova@7.1.0:browser@5.0.3": "bash ./test/test-default.sh 7.1.0 browser 5.0.3",
  "test:cordova@8.0.0:browser@5.0.3": "bash ./test/test-default.sh 8.0.0 browser 5.0.3"
  },
- "dependencies": {}
+ "dependencies": {
+ "xcode": "^2.0.0"
+ }
 }

scripts/ios/helper.js

@@ -1,6 +1,7 @@
 var fs = require("fs");
 var path = require("path");
 var utilities = require("../lib/utilities");
+var xcode = require("xcode");
 
 /**
  * This is used as the display text for the build phase block in XCode as well as the
@@ -30,8 +31,6 @@ module.exports = {
  * (dSYMs) so that Crashlytics can display stack trace information in it's web console.
  */
  addShellScriptBuildPhase: function (context, xcodeProjectPath) {
- var xcode = context.requireCordovaModule("xcode");
-
  // Read and parse the XCode project (.pxbproj) from disk.
  // File format information: http://www.monobjc.net/xcode-project-file-format.html
  var xcodeProject = xcode.project(xcodeProjectPath);
@@ -84,9 +83,6 @@ module.exports = {
  * by the addShellScriptBuildPhase() helper method.
  */
  removeShellScriptBuildPhase: function (context, xcodeProjectPath) {
-
- var xcode = context.requireCordovaModule("xcode");
-
  // Read and parse the XCode project (.pxbproj) from disk.
  // File format information: http://www.monobjc.net/xcode-project-file-format.html
  var xcodeProject = xcode.project(xcodeProjectPath);

test/platform-add.sh

@@ -9,6 +9,10 @@ PLATFORM_VERSION=$3
 FOLDER=".build-$PLATFORM"
 rm -rf $FOLDER
 
+if [[ "$PLATFORM" == "ios" ]]; then
+ npm install xcode --no-save
+fi
+
 npm install "cordova@$CORDOVA_VERSION" --no-save
 ./node_modules/.bin/cordova create $FOLDER com.github.cordova_plugin_firebase HelloWorld
 

test/test-with-3-plugins.sh

@@ -9,7 +9,8 @@ ADDITIONAL_PLUGIN_1=$4
 ADDITIONAL_PLUGIN_2=$5
 ADDITIONAL_PLUGIN_3=$6
 
-bash ./test/platform-add.sh $CORDOVA_VERSION $PLATFORM $PLATFORM_VERSION
+# Do not reinstall the platforms
+#bash ./test/platform-add.sh $CORDOVA_VERSION $PLATFORM $PLATFORM_VERSION
 bash ./test/plugin-add.sh $CORDOVA_VERSION $PLATFORM $PLATFORM_VERSION ..
 bash ./test/plugin-add.sh $CORDOVA_VERSION $PLATFORM $PLATFORM_VERSION $ADDITIONAL_PLUGIN_1
 bash ./test/plugin-add.sh $CORDOVA_VERSION $PLATFORM $PLATFORM_VERSION $ADDITIONAL_PLUGIN_2