Set VERSION to 7.1.0 (via coho)

Update JS snapshot to version 7.1.0 (via coho)
CB-13912 Updated RELEASENOTES and Version for release 7.1.0
2026-01-30 00:05:28 +08:00 · 2018-02-21 10:52:01 -08:00 · 2018-02-21 10:52:00 -08:00 · 2018-02-21 10:50:50 -08:00 · 2018-02-20 11:36:55 -08:00 · 2018-02-20 11:17:05 -08:00
78 changed files with 529 additions and 569 deletions
--- a/.ratignore
+++ b/.ratignore
@@ -6,3 +6,4 @@ spec
 appveyor.yml
 framework/build
 ic_launcher.png
+build
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,18 @@
 -->
 ## Release Notes for Cordova (Android) ##

+### 7.1.0 (Feb 20, 2018)
+* [CB-13879](https://issues.apache.org/jira/browse/CB-13879) updated gradle tools dependency to 3.0.1 for project template
+* [CB-13831](https://issues.apache.org/jira/browse/CB-13831) Update `android-versions` to 1.3.0 to support SDK 27.
+* [CB-13800](https://issues.apache.org/jira/browse/CB-13800) Drop pre-KitKat specific code
+* [CB-13724](https://issues.apache.org/jira/browse/CB-13724) Updated the **Android** Tooling required for the latest version on both the test project, and the template
+* [CB-13724](https://issues.apache.org/jira/browse/CB-13724) Bump Target SDK to API 27
+* [CB-13646](https://issues.apache.org/jira/browse/CB-13646) Using the deprecated `NDK` by default breaks the build.  Crosswalk users need to specify the Gradle parameters to keep it working.
+* [CB-12218](https://issues.apache.org/jira/browse/CB-12218) Fix consistency of null result message
+* [CB-13571](https://issues.apache.org/jira/browse/CB-13571) Prevent crash with unrecognized **Android** version
+* [CB-13721](https://issues.apache.org/jira/browse/CB-13721) Fix build apps that use `cdvHelpers.getConfigPreference`
+* [CB-13621](https://issues.apache.org/jira/browse/CB-13621) Wrote similar warning to [CB-12948](https://issues.apache.org/jira/browse/CB-12948) on **iOS**. We no longer support `cordova update` command.
+
 ### 7.0.0 (Nov 30, 2017)
 * [CB-13612](https://issues.apache.org/jira/browse/CB-13612) Fix the remapper so that XML files copy over and the Camera works again.
 * [CB-13741](https://issues.apache.org/jira/browse/CB-13741) Bump `package.json` so we can install plugins
--- a/2
+++ b/2
@@ -1 +1 @@
-6.5.0-dev
+7.1.0
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -26,10 +26,7 @@ var fs = require('fs');
 var check_reqs = require('./../templates/cordova/lib/check_reqs');
 var ROOT = path.join(__dirname, '..', '..');

-var MIN_SDK_VERSION = 19;
-
 var CordovaError = require('cordova-common').CordovaError;
-var AndroidStudio = require('../templates/cordova/lib/AndroidStudio');
 var AndroidManifest = require('../templates/cordova/lib/AndroidManifest');

 // Export all helper functions, and make sure internally within this module, we
@@ -348,39 +345,16 @@ function generateDoneMessage (type, link) {

 // Returns a promise.
 exports.update = function (projectPath, options, events) {
-    options = options || {};

-    return Q()
-        .then(function () {
+    var errorString =
+        'An in-place platform update is not supported. \n' +
+        'The `platforms` folder is always treated as a build artifact in the CLI workflow.\n' +
+        'To update your platform, you have to remove, then add your android platform again.\n' +
+        'Make sure you save your plugins beforehand using `cordova plugin save`, and save \n' + 'a copy of the platform first if you had manual changes in it.\n' +
+        '\tcordova plugin save\n' +
+        '\tcordova platform rm android\n' +
+        '\tcordova platform add android\n'
+        ;

-            var isAndroidStudio = AndroidStudio.isAndroidStudioProject(projectPath);
-            var isLegacy = !isAndroidStudio;
-            var manifest = null;
-            var builder = 'gradle';
-
-            if (isAndroidStudio) {
-                manifest = new AndroidManifest(path.join(projectPath, 'app', 'main', 'AndroidManifest.xml'));
-                builder = 'studio';
-            } else {
-                manifest = new AndroidManifest(path.join(projectPath, 'AndroidManifest.xml'));
-                builder = 'gradle';
-            }
-
-            if (Number(manifest.getMinSdkVersion()) < MIN_SDK_VERSION) {
-                events.emit('verbose', 'Updating minSdkVersion to ' + MIN_SDK_VERSION + ' in AndroidManifest.xml');
-                manifest.setMinSdkVersion(MIN_SDK_VERSION);
-            }
-
-            manifest.setDebuggable(false).write();
-
-            var projectName = manifest.getActivity().getName();
-            var target_api = check_reqs.get_target();
-
-            exports.copyJsAndLibrary(projectPath, options.link, projectName, isLegacy);
-            exports.copyScripts(projectPath);
-            exports.copyBuildRules(projectPath, isLegacy);
-            exports.writeProjectProperties(projectPath, target_api);
-            exports.prepBuildFiles(projectPath, builder);
-            events.emit('log', generateDoneMessage('update', options.link));
-        }).thenResolve(projectPath);
+    return Q.reject(errorString);
 };
--- a/bin/templates/cordova/lib/android_sdk.js
+++ b/bin/templates/cordova/lib/android_sdk.js
@@ -62,7 +62,8 @@ module.exports.version_string_to_api_level = {
    '5.1': 22,
    '6.0': 23,
    '7.0': 24,
-    '7.1.1': 25
+    '7.1.1': 25,
+    '8.0': 26
 };

 function parse_targets (output) {
--- a/bin/templates/cordova/lib/builders/StudioBuilder.js
+++ b/bin/templates/cordova/lib/builders/StudioBuilder.js
@@ -58,7 +58,7 @@ StudioBuilder.prototype.getArgs = function (cmd, opts) {
    // to allow dex in process
    args.push('-Dorg.gradle.jvmargs=-Xmx2048m');
    // allow NDK to be used - required by Gradle 1.5 plugin
-    args.push('-Pandroid.useDeprecatedNdk=true');
+    // args.push('-Pandroid.useDeprecatedNdk=true');
    args.push.apply(args, opts.extraArgs);
    // Shaves another 100ms, but produces a "try at own risk" warning. Not worth it (yet):
    // args.push('-Dorg.gradle.parallel=true');
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -187,7 +187,9 @@ module.exports.list_images = function () {
                var api_level = avd.target.match(/\d+/);
                if (api_level) {
                    var level = android_versions.get(api_level);
-                    avd.target = 'Android ' + level.semver + ' (API level ' + api_level + ')';
+                    if (level) {
+                        avd.target = 'Android ' + level.semver + ' (API level ' + api_level + ')';
+                    }
                }
            }
            return avd;
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
 */

 // Coho updates this line:
-var VERSION = "6.5.0-dev";
+var VERSION = "7.1.0";

 module.exports.version = VERSION;

--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@ -45,5 +45,5 @@
        </activity>
    </application>

-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="__APILEVEL__"/>
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="__APILEVEL__"/>
 </manifest>
--- a/bin/templates/project/app/build.gradle
+++ b/bin/templates/project/app/build.gradle
@@ -29,7 +29,7 @@ buildscript {
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
    }
 }

--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -19,7 +19,7 @@
 under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '6.5.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '7.1.0';
 // file: src/scripts/require.js

 /* jshint -W079 */
@@ -326,7 +326,7 @@ module.exports = cordova;

 });

-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
 define("cordova/android/nativeapiprovider", function(require, exports, module) {

 /**
@@ -349,7 +349,7 @@ module.exports = {

 });

-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
 define("cordova/android/promptbasednativeapi", function(require, exports, module) {

 /**
@@ -881,7 +881,7 @@ module.exports = channel;

 });

-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/exec.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/exec.js
 define("cordova/exec", function(require, exports, module) {

 /**
@@ -1639,7 +1639,7 @@ exports.reset();

 });

-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/platform.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js
 define("cordova/platform", function(require, exports, module) {

 // The last resume event that was received that had the result of a plugin call.
@@ -1749,7 +1749,7 @@ function onMessageFromNative(msg) {

 });

-// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/plugin/android/app.js
+// file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/plugin/android/app.js
 define("cordova/plugin/android/app", function(require, exports, module) {

 var exec = require('cordova/exec');
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -29,7 +29,7 @@ buildscript {

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
    }
 }

@@ -42,10 +42,10 @@ allprojects {
    }
    //This replaces project.properties w.r.t. build settings
    project.ext {
-      defaultBuildToolsVersion="25.0.2" //String
+      defaultBuildToolsVersion="27.0.1" //String
      defaultMinSdkVersion=19 //Integer - Minimum requirement is Android 4.4
-      defaultTargetSdkVersion=26 //Integer - We ALWAYS target the latest by default
-      defaultCompileSdkVersion=26 //Integer - We ALWAYS compile with the latest by default
+      defaultTargetSdkVersion=27 //Integer - We ALWAYS target the latest by default
+      defaultCompileSdkVersion=27 //Integer - We ALWAYS compile with the latest by default
    }
 }

--- a/framework/AndroidManifest.xml
+++ b/framework/AndroidManifest.xml
@@ -19,5 +19,5 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="org.apache.cordova" android:versionName="1.0" android:versionCode="1">
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="19" />
 </manifest>
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -31,7 +31,7 @@ buildscript {
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
    }
@@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'

 group = 'org.apache.cordova'
-version = '7.0.0'
+version = '7.1.0'

 android {
    compileSdkVersion cdvCompileSdkVersion
@@ -129,9 +129,9 @@ bintray {
        licenses = ['Apache-2.0']
        labels = ['android', 'cordova', 'phonegap']
        version {
-            name = '6.5.0-dev'
+            name = '7.1.0'
            released  = new Date()
-            vcsTag = '6.5.0-dev'
+            vcsTag = '7.1.0'
        }
    }
 }
--- a/framework/cordova.gradle
+++ b/framework/cordova.gradle
@@ -165,7 +165,7 @@ def doPromptForPassword(msg) {
 }

 def doGetConfigXml() {
-    def xml = file("res/xml/config.xml").getText()
+    def xml = file("src/main/res/xml/config.xml").getText()
    // Disable namespace awareness since Cordova doesn't use them properly
    return new XmlParser(false, false).parseText(xml)
 }
--- a/framework/project.properties
+++ b/framework/project.properties
@@ -10,7 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-26
+target=android-27
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -123,7 +123,7 @@ public class CordovaActivity extends Activity {
        if (preferences.getBoolean("Fullscreen", false)) {
            // NOTE: use the FullscreenNotImmersive configuration key to set the activity in a REAL full screen
            // (as was the case in previous cordova versions)
-            if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) && !preferences.getBoolean("FullscreenNotImmersive", false)) {
+            if (!preferences.getBoolean("FullscreenNotImmersive", false)) {
                immersiveMode = true;
            } else {
                getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
 * are not expected to implement it.
 */
 public interface CordovaWebView {
-    public static final String CORDOVA_VERSION = "6.5.0-dev";
+    public static final String CORDOVA_VERSION = "7.1.0";

    void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);

--- a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
+++ b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
@@ -511,6 +511,9 @@ public class NativeToJsMessageQueue {
                            .append(pluginResult.getMessage())
                            .append("')");
                    break;
+                case PluginResult.MESSAGE_TYPE_NULL:
+                    sb.append("null");
+                    break;
                default:
                    sb.append(pluginResult.getMessage());
            }
--- a/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
@@ -149,21 +149,6 @@ public class SystemWebChromeClient extends WebChromeClient {
        quotaUpdater.updateQuota(MAX_QUOTA);
    }

-    // console.log in api level 7: http://developer.android.com/guide/developing/debug-tasks.html
-    // Expect this to not compile in a future Android release!
-    @SuppressWarnings("deprecation")
-    @Override
-    public void onConsoleMessage(String message, int lineNumber, String sourceID)
-    {
-        //This is only for Android 2.1
-        if(android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.ECLAIR_MR1)
-        {
-            LOG.d(LOG_TAG, "%s: Line %d : %s", sourceID, lineNumber, message);
-            super.onConsoleMessage(message, lineNumber, sourceID);
-        }
-    }
-
-    @TargetApi(8)
    @Override
    public boolean onConsoleMessage(ConsoleMessage consoleMessage)
    {
--- a/framework/src/org/apache/cordova/engine/SystemWebViewClient.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebViewClient.java
@@ -112,7 +112,7 @@ public class SystemWebViewClient extends WebViewClient {
     * @param request
     */
    @Override
-    @TargetApi(21)
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
    public void onReceivedClientCertRequest (WebView view, ClientCertRequest request)
    {

@@ -219,7 +219,6 @@ public class SystemWebViewClient extends WebViewClient {
     * @param handler       An SslErrorHandler object that will handle the user's response.
     * @param error         The SSL error object.
     */
-    @TargetApi(8)
    @Override
    public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {

@@ -316,7 +315,6 @@ public class SystemWebViewClient extends WebViewClient {
        this.authenticationTokens.clear();
    }

-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
    @Override
    public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
        try {
@@ -349,7 +347,7 @@ public class SystemWebViewClient extends WebViewClient {
    }

    private static boolean needsKitKatContentUrlFix(Uri uri) {
-        return android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT && "content".equals(uri.getScheme());
+        return "content".equals(uri.getScheme());
    }

    private static boolean needsSpecialsInAssetUrlFix(Uri uri) {
@@ -364,11 +362,6 @@ public class SystemWebViewClient extends WebViewClient {
            return false;
        }

-        switch(android.os.Build.VERSION.SDK_INT){
-            case android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH:
-            case android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1:
-                return true;
-        }
        return false;
    }
 }
--- a/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
@@ -121,9 +121,8 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
                SystemWebViewEngine.this.cordova.getActivity().runOnUiThread(r);
            }
        }));
-        if(Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2)
-            nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.EvalBridgeMode(this, cordova));
-	bridge = new CordovaBridge(pluginManager, nativeToJsMessageQueue);
+        nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.EvalBridgeMode(this, cordova));
+        bridge = new CordovaBridge(pluginManager, nativeToJsMessageQueue);
        exposeJsInterface(webView, bridge);
    }

@@ -153,26 +152,8 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
        settings.setJavaScriptCanOpenWindowsAutomatically(true);
        settings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL);

-        // Set the nav dump for HTC 2.x devices (disabling for ICS, deprecated entirely for Jellybean 4.2)
-        try {
-            Method gingerbread_getMethod =  WebSettings.class.getMethod("setNavDump", new Class[] { boolean.class });
-
-            String manufacturer = android.os.Build.MANUFACTURER;
-            LOG.d(TAG, "CordovaWebView is running on device made by: " + manufacturer);
-            if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB &&
-                    android.os.Build.MANUFACTURER.contains("HTC"))
-            {
-                gingerbread_getMethod.invoke(settings, true);
-            }
-        } catch (NoSuchMethodException e) {
-            LOG.d(TAG, "We are on a modern version of Android, we will deprecate HTC 2.3 devices in 2.8");
-        } catch (IllegalArgumentException e) {
-            LOG.d(TAG, "Doing the NavDump failed with bad arguments");
-        } catch (IllegalAccessException e) {
-            LOG.d(TAG, "This should never happen: IllegalAccessException means this isn't Android anymore");
-        } catch (InvocationTargetException e) {
-            LOG.d(TAG, "This should never happen: InvocationTargetException means this isn't Android anymore.");
-        }
+        String manufacturer = android.os.Build.MANUFACTURER;
+        LOG.d(TAG, "CordovaWebView is running on device made by: " + manufacturer);

        //We don't save any form data in the application
        settings.setSaveFormData(false);
@@ -180,12 +161,9 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {

        // Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist
        // while we do this
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
-            settings.setAllowUniversalAccessFromFileURLs(true);
-        }
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            settings.setMediaPlaybackRequiresUserGesture(false);
-        }
+        settings.setAllowUniversalAccessFromFileURLs(true);
+        settings.setMediaPlaybackRequiresUserGesture(false);
+
        // Enable database
        // We keep this disabled because we use or shim to get around DOM_EXCEPTION_ERROR_16
        String databasePath = webView.getContext().getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
@@ -195,8 +173,7 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {

        //Determine whether we're in debug or release mode, and turn on Debugging!
        ApplicationInfo appInfo = webView.getContext().getApplicationContext().getApplicationInfo();
-        if ((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0 &&
-            android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+        if ((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
            enableRemoteDebugging();
        }

@@ -244,7 +221,6 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
        // end CB-1405
    }

-    @TargetApi(Build.VERSION_CODES.KITKAT)
    private void enableRemoteDebugging() {
        try {
            WebView.setWebContentsDebuggingEnabled(true);
@@ -254,17 +230,9 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
        }
    }

-    // Yeah, we know, which is why we makes ure that we don't do this if the bridge is
-    // below JELLYBEAN_MR1.  It'd be great if lint was just a little smarter.
+    // Yeah, we know. It'd be great if lint was just a little smarter.
    @SuppressLint("AddJavascriptInterface")
    private static void exposeJsInterface(WebView webView, CordovaBridge bridge) {
-        if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)) {
-            LOG.i(TAG, "Disabled addJavascriptInterface() bridge since Android version is old.");
-            // Bug being that Java Strings do not get converted to JS strings automatically.
-            // This isn't hard to work-around on the JS side, but it's easier to just
-            // use the prompt bridge instead.
-            return;
-        }
        SystemExposedJsApi exposedJsApi = new SystemExposedJsApi(bridge);
        webView.addJavascriptInterface(exposedJsApi, "_cordovaNative");
    }
@@ -346,12 +314,6 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {

    @Override
    public void evaluateJavascript(String js, ValueCallback<String> callback) {
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            webView.evaluateJavascript(js, callback);
-        }
-        else
-        {
-            LOG.d(TAG, "This webview is using the old bridge");
-        }
+        webView.evaluateJavascript(js, callback);
    }
 }
--- a/node_modules/abbrev/package.json
+++ b/node_modules/abbrev/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.0.0 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/nopt"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt"
    ]
  ],
  "_from": "abbrev@>=1.0.0 <2.0.0",
@@ -44,7 +44,7 @@
  "_shasum": "f8f2c887ad10bf67f634f005b6987fed3179aac8",
  "_shrinkwrap": null,
  "_spec": "abbrev@1",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/nopt",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me"
--- a/node_modules/android-versions/index.js
+++ b/node_modules/android-versions/index.js
@@ -30,41 +30,41 @@
 */

 var VERSIONS = {
-  BASE:                   { api: 1,     ndk: 0, semver: "1.0",   name: "(no code name)",     versionCode: "BASE" },
-  BASE_1_1:               { api: 2,     ndk: 0, semver: "1.1",   name: "(no code name)",     versionCode: "BASE_1_1" },
-  CUPCAKE:                { api: 3,     ndk: 1, semver: "1.5",   name: "Cupcake",            versionCode: "CUPCAKE" },
-  DONUT:                  { api: 4,     ndk: 2, semver: "1.6",   name: "Donut",              versionCode: "DONUT" },
-  ECLAIR:                 { api: 5,     ndk: 2, semver: "2.0",   name: "Eclair",             versionCode: "ECLAIR" },
-  ECLAIR_0_1:             { api: 6,     ndk: 2, semver: "2.0.1", name: "Eclair",             versionCode: "ECLAIR_0_1" },
-  ECLAIR_MR1:             { api: 7,     ndk: 3, semver: "2.1",   name: "Eclair",             versionCode: "ECLAIR_MR1" },
-  FROYO:                  { api: 8,     ndk: 4, semver: "2.2",   name: "Froyo",              versionCode: "FROYO" },
-  GINGERBREAD:            { api: 9,     ndk: 5, semver: "2.3",   name: "Gingerbread",        versionCode: "GINGERBREAD" },
-  GINGERBREAD_MR1:        { api: 10,    ndk: 5, semver: "2.3.3", name: "Gingerbread",        versionCode: "GINGERBREAD_MR1" },
-  HONEYCOMB:              { api: 11,    ndk: 5, semver: "3.0",   name: "Honeycomb",          versionCode: "HONEYCOMB" },
-  HONEYCOMB_MR1:          { api: 12,    ndk: 6, semver: "3.1",   name: "Honeycomb",          versionCode: "HONEYCOMB_MR1" },
-  HONEYCOMB_MR2:          { api: 13,    ndk: 6, semver: "3.2",   name: "Honeycomb",          versionCode: "HONEYCOMB_MR2" },
-  ICE_CREAM_SANDWICH:     { api: 14,    ndk: 7, semver: "4.0",   name: "Ice Cream Sandwich", versionCode: "ICE_CREAM_SANDWICH" },
-  ICE_CREAM_SANDWICH_MR1: { api: 15,    ndk: 8, semver: "4.0.3", name: "Ice Cream Sandwich", versionCode: "ICE_CREAM_SANDWICH_MR1" },
-  JELLY_BEAN:             { api: 16,    ndk: 8, semver: "4.1",   name: "Jellybean",          versionCode: "JELLY_BEAN" },
-  JELLY_BEAN_MR1:         { api: 17,    ndk: 8, semver: "4.2",   name: "Jellybean",          versionCode: "JELLY_BEAN_MR1" },
-  JELLY_BEAN_MR2:         { api: 18,    ndk: 8, semver: "4.3",   name: "Jellybean",          versionCode: "JELLY_BEAN_MR2" },
-  KITKAT:                 { api: 19,    ndk: 8, semver: "4.4",   name: "KitKat",             versionCode: "KITKAT" },
-  KITKAT_WATCH:           { api: 20,    ndk: 8, semver: "4.4",   name: "KitKat Watch",       versionCode: "KITKAT_WATCH" },
-  LOLLIPOP:               { api: 21,    ndk: 8, semver: "5.0",   name: "Lollipop",           versionCode: "LOLLIPOP" },
-  LOLLIPOP_MR1:           { api: 22,    ndk: 8, semver: "5.1",   name: "Lollipop",           versionCode: "LOLLIPOP_MR1" },
-  M:                      { api: 23,    ndk: 8, semver: "6.0",   name: "Marshmallow",        versionCode: "M" },
-  N:                      { api: 24,    ndk: 8, semver: "7.0",   name: "Nougat",             versionCode: "N" },
-  N_MR1:                  { api: 25,    ndk: 8, semver: "7.1",   name: "Nougat",             versionCode: "N_MR1" },
-  O:                      { api: 26,    ndk: 8, semver: "8.0.0", name: "Oreo",               versionCode: "O" }
+  BASE:                   { api: 1,     ndk: 0, semver: "1.0",               name: "(no code name)",     versionCode: "BASE" },
+  BASE_1_1:               { api: 2,     ndk: 0, semver: "1.1",               name: "(no code name)",     versionCode: "BASE_1_1" },
+  CUPCAKE:                { api: 3,     ndk: 1, semver: "1.5",               name: "Cupcake",            versionCode: "CUPCAKE" },
+  DONUT:                  { api: 4,     ndk: 2, semver: "1.6",               name: "Donut",              versionCode: "DONUT" },
+  ECLAIR:                 { api: 5,     ndk: 2, semver: "2.0",               name: "Eclair",             versionCode: "ECLAIR" },
+  ECLAIR_0_1:             { api: 6,     ndk: 2, semver: "2.0.1",             name: "Eclair",             versionCode: "ECLAIR_0_1" },
+  ECLAIR_MR1:             { api: 7,     ndk: 3, semver: "2.1",               name: "Eclair",             versionCode: "ECLAIR_MR1" },
+  FROYO:                  { api: 8,     ndk: 4, semver: "2.2.x",             name: "Froyo",              versionCode: "FROYO" },
+  GINGERBREAD:            { api: 9,     ndk: 5, semver: "2.3.0 - 2.3.2",     name: "Gingerbread",        versionCode: "GINGERBREAD" },
+  GINGERBREAD_MR1:        { api: 10,    ndk: 5, semver: "2.3.3 - 2.3.7",     name: "Gingerbread",        versionCode: "GINGERBREAD_MR1" },
+  HONEYCOMB:              { api: 11,    ndk: 5, semver: "3.0",               name: "Honeycomb",          versionCode: "HONEYCOMB" },
+  HONEYCOMB_MR1:          { api: 12,    ndk: 6, semver: "3.1",               name: "Honeycomb",          versionCode: "HONEYCOMB_MR1" },
+  HONEYCOMB_MR2:          { api: 13,    ndk: 6, semver: "3.2.x",             name: "Honeycomb",          versionCode: "HONEYCOMB_MR2" },
+  ICE_CREAM_SANDWICH:     { api: 14,    ndk: 7, semver: "4.0.1 - 4.0.2",     name: "Ice Cream Sandwich", versionCode: "ICE_CREAM_SANDWICH" },
+  ICE_CREAM_SANDWICH_MR1: { api: 15,    ndk: 8, semver: "4.0.3 - 4.0.4",     name: "Ice Cream Sandwich", versionCode: "ICE_CREAM_SANDWICH_MR1" },
+  JELLY_BEAN:             { api: 16,    ndk: 8, semver: "4.1.x",             name: "Jellybean",          versionCode: "JELLY_BEAN" },
+  JELLY_BEAN_MR1:         { api: 17,    ndk: 8, semver: "4.2.x",             name: "Jellybean",          versionCode: "JELLY_BEAN_MR1" },
+  JELLY_BEAN_MR2:         { api: 18,    ndk: 8, semver: "4.3.x",             name: "Jellybean",          versionCode: "JELLY_BEAN_MR2" },
+  KITKAT:                 { api: 19,    ndk: 8, semver: "4.4.0 - 4.4.4",     name: "KitKat",             versionCode: "KITKAT" },
+  KITKAT_WATCH:           { api: 20,    ndk: 8, semver: "4.4",               name: "KitKat Watch",       versionCode: "KITKAT_WATCH" },
+  LOLLIPOP:               { api: 21,    ndk: 8, semver: "5.0",               name: "Lollipop",           versionCode: "LOLLIPOP" },
+  LOLLIPOP_MR1:           { api: 22,    ndk: 8, semver: "5.1",               name: "Lollipop",           versionCode: "LOLLIPOP_MR1" },
+  M:                      { api: 23,    ndk: 8, semver: "6.0",               name: "Marshmallow",        versionCode: "M" },
+  N:                      { api: 24,    ndk: 8, semver: "7.0",               name: "Nougat",             versionCode: "N" },
+  N_MR1:                  { api: 25,    ndk: 8, semver: "7.1",               name: "Nougat",             versionCode: "N_MR1" },
+  O:                      { api: 26,    ndk: 8, semver: "8.0.0",             name: "Oreo",               versionCode: "O" },
+  O_MR1:                  { api: 27,    ndk: 8, semver: "8.1.0",             name: "Oreo",               versionCode: "O_MR1" }
 }

-// This altSemVer accomodates the variations of semantic versions in the table above.
-// For instance, Oreo is 8.0.0 while N is 7.0, searching for "8.0" or "8.0.0" will
-// return Oreo, or searching for "7.0" or "7.0.0" will return N. "2.2.0" will return Froyo.
-function getAlternateSemVer(semver) {
-  if (semver.match(/\d+.\d+.0/)) {
-    return semver.replace(/.\d+$/, '')
-  } else if (semver.match(/^\d+.\d+$/)) {
+var semver = require('semver');
+
+// semver format requires <major>.<minor>.<patch> but we allow just <major>.<minor> format.
+// Coerce <major>.<minor> to <major>.<minor>.0
+function formatSemver(semver) {
+  if (semver.match(/^\d+.\d+$/)) {
    return semver + '.0'
  } else {
    return semver
@@ -82,9 +82,10 @@ function getFromDefaultPredicate(arg) {
      return true
    }

-    // Compare semver and alternate semver (see above).
-    var altSemVer = getAlternateSemVer(arg)
-    if (version.semver === arg || version.semver === altSemVer) {
+    let argSemver = formatSemver(arg);
+    let versionSemver = formatSemver(version.semver);
+
+    if (semver.valid(argSemver) && semver.satisfies(argSemver, versionSemver)) {
      return true
    }

--- a/node_modules/android-versions/package.json
+++ b/node_modules/android-versions/package.json
@@ -2,69 +2,70 @@
  "_args": [
    [
      {
-        "raw": "android-versions@^1.2.1",
+        "raw": "android-versions@^1.3.0",
        "scope": null,
        "escapedName": "android-versions",
        "name": "android-versions",
-        "rawSpec": "^1.2.1",
-        "spec": ">=1.2.1 <2.0.0",
+        "rawSpec": "^1.3.0",
+        "spec": ">=1.3.0 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android"
+      "/Users/steveng/repo/cordova/cordova-android"
    ]
  ],
-  "_from": "android-versions@>=1.2.1 <2.0.0",
-  "_id": "android-versions@1.2.1",
+  "_from": "android-versions@>=1.3.0 <2.0.0",
+  "_id": "android-versions@1.3.0",
  "_inCache": true,
  "_location": "/android-versions",
-  "_nodeVersion": "8.0.0",
+  "_nodeVersion": "8.9.1",
  "_npmOperationalInternal": {
    "host": "s3://npm-registry-packages",
-    "tmp": "tmp/android-versions-1.2.1.tgz_1505373302036_0.5689644906669855"
+    "tmp": "tmp/android-versions-1.3.0.tgz_1516678569554_0.20621655881404877"
  },
  "_npmUser": {
    "name": "dvoiss",
    "email": "davidvoiss@gmail.com"
  },
-  "_npmVersion": "5.4.0",
+  "_npmVersion": "5.5.1",
  "_phantomChildren": {},
  "_requested": {
-    "raw": "android-versions@^1.2.1",
+    "raw": "android-versions@^1.3.0",
    "scope": null,
    "escapedName": "android-versions",
    "name": "android-versions",
-    "rawSpec": "^1.2.1",
-    "spec": ">=1.2.1 <2.0.0",
+    "rawSpec": "^1.3.0",
+    "spec": ">=1.3.0 <2.0.0",
    "type": "range"
  },
  "_requiredBy": [
    "/"
  ],
-  "_resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.2.1.tgz",
-  "_shasum": "3f50baf693e73a512c3c5403542291cead900063",
+  "_resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.3.0.tgz",
+  "_shasum": "ce6f3eae2e165ce4ed49b89beb68014741093044",
  "_shrinkwrap": null,
-  "_spec": "android-versions@^1.2.1",
-  "_where": "/Users/jbowser/cordova/cordova-android",
+  "_spec": "android-versions@^1.3.0",
+  "_where": "/Users/steveng/repo/cordova/cordova-android",
  "author": {
    "name": "dvoiss"
  },
  "bugs": {
    "url": "https://github.com/dvoiss/android-versions/issues"
  },
-  "dependencies": {},
+  "dependencies": {
+    "semver": "^5.4.1"
+  },
  "description": "Get the name, API level, version level, NDK level, or version code from any version of Android.",
  "devDependencies": {
-    "jsdoc": "^3.4.0",
    "jshint": "^2.9.2",
    "tape": "^4.6.0"
  },
  "directories": {},
  "dist": {
-    "integrity": "sha512-k6zlrtWbJ3tx1ZsyyJ0Bo3r6cqPA3JUnFGv7pnIaLr1XVxSi2Tcem2lg3kBebFp27v/A40tZqdlouPyakpyKrw==",
-    "shasum": "3f50baf693e73a512c3c5403542291cead900063",
-    "tarball": "https://registry.npmjs.org/android-versions/-/android-versions-1.2.1.tgz"
+    "integrity": "sha512-d/i1G16Oaw/T1EvskUA7Oo1vIQVK/0ZlpQgZfYVBwg6v/9FBE3QV66g5N1/bTHpRml8tFLxh+KoTw5DokK9c+A==",
+    "shasum": "ce6f3eae2e165ce4ed49b89beb68014741093044",
+    "tarball": "https://registry.npmjs.org/android-versions/-/android-versions-1.3.0.tgz"
  },
-  "gitHead": "7e2def6e70634a4ebcaaa639a4c4955ae2a566e7",
+  "gitHead": "f9772c197a75709df703a2cf339b4427032b08d3",
  "homepage": "https://github.com/dvoiss/android-versions#readme",
  "keywords": [
    "android",
@@ -95,9 +96,8 @@
    "url": "git+https://github.com/dvoiss/android-versions.git"
  },
  "scripts": {
-    "docs": "jsdoc index.js -d ./docs/ -R README.md --debug",
    "jshint": "jshint .",
    "test": "tape tests/**/*.js"
  },
-  "version": "1.2.1"
+  "version": "1.3.0"
 }
--- a/node_modules/android-versions/tests/index.test.js
+++ b/node_modules/android-versions/tests/index.test.js
@@ -0,0 +1,118 @@
+"use strict";
+
+var test = require('tape')
+var android = require('..')
+
+test('get specific version by API level', (t) => {
+  t.plan(1)
+  t.equal(android.get(24).name, "Nougat")
+})
+
+test('getAll versions by API level', (t) => {
+  t.plan(1)
+  t.equal(android.getAll(24)[0].name, "Nougat")
+})
+
+test('get specific version by predicate', (t) => {
+  t.plan(2)
+
+  var actual = android.get((version) => {
+    return version.name.indexOf("on") !== -1
+  })
+  t.equal(actual.name, "Donut")
+
+  actual = android.get((version) => {
+    return version.ndk > 5 && version.api < 15
+  })
+  t.equal(actual.versionCode, "HONEYCOMB_MR1")
+})
+
+test('getAll versions by predicate', (t) => {
+  t.plan(3)
+
+  var actual = android.getAll((version) => {
+    return version.name.indexOf("on") !== -1
+  }).map((version) => version.name)
+  t.deepEqual(actual, ["Donut", "Honeycomb", "Honeycomb", "Honeycomb"])
+
+  actual = android.getAll((version) => {
+    return version.ndk > 5 && version.api < 15
+  }).map((version) => version.versionCode)
+  t.deepEqual(actual, ["HONEYCOMB_MR1", "HONEYCOMB_MR2", "ICE_CREAM_SANDWICH"])
+
+  actual = android.getAll((version) => {
+    return version.api > 22
+  }).map((version) => version.versionCode)
+  t.deepEqual(actual, ["M", "N", "N_MR1", "O", "O_MR1"])
+})
+
+test('get version by semantic version', (t) => {
+  t.plan(4)
+  t.equal(android.get("6.0").versionCode, android.M.versionCode)
+  t.equal(android.get("6.0.0").versionCode, android.M.versionCode)
+  t.equal(android.get("2.3").versionCode, android.GINGERBREAD.versionCode)
+  t.equal(android.get("2.3.3").versionCode, android.GINGERBREAD_MR1.versionCode)
+})
+
+test('support version ranges', (t) => {
+  t.plan(7);
+  t.equal(android.get("4.4").versionCode, android.KITKAT.versionCode);
+  t.equal(android.get("4.4.0").versionCode, android.KITKAT.versionCode);
+  t.equal(android.get("4.4.1").versionCode, android.KITKAT.versionCode);
+  t.equal(android.get("4.4.2").versionCode, android.KITKAT.versionCode);
+  t.equal(android.get("4.4.3").versionCode, android.KITKAT.versionCode);
+  t.equal(android.get("4.4.4").versionCode, android.KITKAT.versionCode);
+  t.equal(android.get("4.4.5"), null);
+})
+
+test('support x-ranges', (t) => {
+  t.plan(12);
+  t.equal(android.get("4.1").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.0").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.1").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.2").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.3").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.4").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.5").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.6").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.7").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.8").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.9").versionCode, android.JELLY_BEAN.versionCode);
+  t.equal(android.get("4.1.10").versionCode, android.JELLY_BEAN.versionCode);
+});
+
+test('access version codes object', (t) => {
+  t.plan(1)
+  t.ok(android.VERSIONS)
+})
+
+test('access specific versions directly', (t) => {
+  t.plan(27)
+  t.ok(android.BASE)
+  t.ok(android.BASE_1_1)
+  t.ok(android.CUPCAKE)
+  t.ok(android.DONUT)
+  t.ok(android.ECLAIR)
+  t.ok(android.ECLAIR_0_1)
+  t.ok(android.ECLAIR_MR1)
+  t.ok(android.FROYO)
+  t.ok(android.GINGERBREAD)
+  t.ok(android.GINGERBREAD_MR1)
+  t.ok(android.HONEYCOMB)
+  t.ok(android.HONEYCOMB_MR1)
+  t.ok(android.HONEYCOMB_MR2)
+  t.ok(android.ICE_CREAM_SANDWICH)
+  t.ok(android.ICE_CREAM_SANDWICH_MR1)
+  t.ok(android.JELLY_BEAN)
+  t.ok(android.JELLY_BEAN_MR1)
+  t.ok(android.JELLY_BEAN_MR2)
+  t.ok(android.KITKAT)
+  t.ok(android.KITKAT_WATCH)
+  t.ok(android.LOLLIPOP)
+  t.ok(android.LOLLIPOP_MR1)
+  t.ok(android.M)
+  t.ok(android.N)
+  t.ok(android.N_MR1)
+  t.ok(android.O)
+  t.ok(android.O_MR1)
+})
--- a/node_modules/ansi/package.json
+++ b/node_modules/ansi/package.json
@@ -10,7 +10,7 @@
        "spec": ">=0.3.1 <0.4.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
    ]
  ],
  "_from": "ansi@>=0.3.1 <0.4.0",
@@ -36,11 +36,11 @@
  "_requiredBy": [
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+  "_resolved": "http://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
  "_shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21",
  "_shrinkwrap": null,
  "_spec": "ansi@^0.3.1",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
    "name": "Nathan Rajlich",
    "email": "nathan@tootallnate.net",
--- a/node_modules/balanced-match/package.json
+++ b/node_modules/balanced-match/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.0.0 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/brace-expansion"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion"
    ]
  ],
  "_from": "balanced-match@>=1.0.0 <2.0.0",
@@ -44,7 +44,7 @@
  "_shasum": "89b4d199ab2bee49de164ea02b89ce462d71b767",
  "_shrinkwrap": null,
  "_spec": "balanced-match@^1.0.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/brace-expansion",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion",
  "author": {
    "name": "Julian Gruber",
    "email": "mail@juliangruber.com",
--- a/node_modules/base64-js/package.json
+++ b/node_modules/base64-js/package.json
@@ -10,7 +10,7 @@
        "spec": "0.0.8",
        "type": "version"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/plist"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/plist"
    ]
  ],
  "_from": "base64-js@0.0.8",
@@ -40,7 +40,7 @@
  "_shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978",
  "_shrinkwrap": null,
  "_spec": "base64-js@0.0.8",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/plist",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist",
  "author": {
    "name": "T. Jameson Little",
    "email": "t.jameson.little@gmail.com"
--- a/node_modules/big-integer/package.json
+++ b/node_modules/big-integer/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.6.7 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/bplist-parser"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser"
    ]
  ],
  "_from": "big-integer@>=1.6.7 <2.0.0",
@@ -44,7 +44,7 @@
  "_shasum": "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8",
  "_shrinkwrap": null,
  "_spec": "big-integer@^1.6.7",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/bplist-parser",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser",
  "author": {
    "name": "Peter Olson",
    "email": "peter.e.c.olson+npm@gmail.com"
--- a/node_modules/bplist-parser/package.json
+++ b/node_modules/bplist-parser/package.json
@@ -10,7 +10,7 @@
        "spec": ">=0.1.0 <0.2.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
    ]
  ],
  "_from": "bplist-parser@>=0.1.0 <0.2.0",
@@ -36,11 +36,11 @@
  "_requiredBy": [
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+  "_resolved": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
  "_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6",
  "_shrinkwrap": null,
  "_spec": "bplist-parser@^0.1.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
    "name": "Joe Ferner",
    "email": "joe.ferner@nearinfinity.com"
--- a/node_modules/brace-expansion/LICENSE
+++ b/node_modules/brace-expansion/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/node_modules/brace-expansion/README.md
+++ b/node_modules/brace-expansion/README.md
@@ -63,7 +63,7 @@ Valid expansions are:
 // {a,b,...}
 ```

-A comma seperated list of options, like `{a,b}` or `{a,{b,c}}` or `{,a,}`.
+A comma separated list of options, like `{a,b}` or `{a,{b,c}}` or `{,a,}`.

 ```js
 /^-?\d+\.\.-?\d+(\.\.-?\d+)?$/
@@ -98,6 +98,12 @@ npm install brace-expansion
 - [Julian Gruber](https://github.com/juliangruber)
 - [Isaac Z. Schlueter](https://github.com/isaacs)

+## Sponsors
+
+This module is proudly supported by my [Sponsors](https://github.com/juliangruber/sponsors)!
+
+Do you want to support modules like this to improve their quality, stability and weigh in on new features? Then please consider donating to my [Patreon](https://www.patreon.com/juliangruber). Not sure how much of my modules you're using? Try [feross/thanks](https://github.com/feross/thanks)!
+
 ## License

 (MIT)
--- a/node_modules/brace-expansion/package.json
+++ b/node_modules/brace-expansion/package.json
@@ -10,23 +10,23 @@
        "spec": ">=1.1.7 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/minimatch"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch"
    ]
  ],
  "_from": "brace-expansion@>=1.1.7 <2.0.0",
-  "_id": "brace-expansion@1.1.8",
+  "_id": "brace-expansion@1.1.11",
  "_inCache": true,
  "_location": "/brace-expansion",
-  "_nodeVersion": "7.8.0",
+  "_nodeVersion": "9.0.0",
  "_npmOperationalInternal": {
    "host": "s3://npm-registry-packages",
-    "tmp": "tmp/brace-expansion-1.1.8.tgz_1497251980593_0.6575565172825009"
+    "tmp": "tmp/brace-expansion_1.1.11_1518248541320_0.33962849281003904"
  },
  "_npmUser": {
    "name": "juliangruber",
    "email": "julian@juliangruber.com"
  },
-  "_npmVersion": "4.2.0",
+  "_npmVersion": "5.5.1",
  "_phantomChildren": {},
  "_requested": {
    "raw": "brace-expansion@^1.1.7",
@@ -40,11 +40,11 @@
  "_requiredBy": [
    "/minimatch"
  ],
-  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-  "_shasum": "c07b211c7c952ec1f8efd51a77ef0d1d3990a292",
+  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+  "_shasum": "3c7fcbf529d87226f3d2f52b966ff5271eb441dd",
  "_shrinkwrap": null,
  "_spec": "brace-expansion@^1.1.7",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/minimatch",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch",
  "author": {
    "name": "Julian Gruber",
    "email": "mail@juliangruber.com",
@@ -64,22 +64,25 @@
  },
  "directories": {},
  "dist": {
-    "shasum": "c07b211c7c952ec1f8efd51a77ef0d1d3990a292",
-    "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
+    "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "shasum": "3c7fcbf529d87226f3d2f52b966ff5271eb441dd",
+    "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+    "fileCount": 4,
+    "unpackedSize": 11059
  },
-  "gitHead": "8f59e68bd5c915a0d624e8e39354e1ccf672edf6",
+  "gitHead": "01a21de7441549d26ac0c0a9ff91385d16e5c21c",
  "homepage": "https://github.com/juliangruber/brace-expansion",
  "keywords": [],
  "license": "MIT",
  "main": "index.js",
  "maintainers": [
-    {
-      "name": "juliangruber",
-      "email": "julian@juliangruber.com"
-    },
    {
      "name": "isaacs",
      "email": "isaacs@npmjs.com"
+    },
+    {
+      "name": "juliangruber",
+      "email": "julian@juliangruber.com"
    }
  ],
  "name": "brace-expansion",
@@ -110,5 +113,5 @@
      "android-browser/4.2..latest"
    ]
  },
-  "version": "1.1.8"
+  "version": "1.1.11"
 }
--- a/node_modules/concat-map/package.json
+++ b/node_modules/concat-map/package.json
@@ -10,7 +10,7 @@
        "spec": "0.0.1",
        "type": "version"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/brace-expansion"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion"
    ]
  ],
  "_from": "concat-map@0.0.1",
@@ -35,11 +35,11 @@
  "_requiredBy": [
    "/brace-expansion"
  ],
-  "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+  "_resolved": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
  "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
  "_shrinkwrap": null,
  "_spec": "concat-map@0.0.1",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/brace-expansion",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion",
  "author": {
    "name": "James Halliday",
    "email": "mail@substack.net",
--- a/node_modules/cordova-common/.npmignore
+++ b/node_modules/cordova-common/.npmignore
@@ -1,2 +0,0 @@
-spec
-coverage
--- a/node_modules/cordova-common/RELEASENOTES.md
+++ b/node_modules/cordova-common/RELEASENOTES.md
@@ -20,6 +20,9 @@
 -->
 # Cordova-common Release Notes

+### 2.2.1 (Dec 14, 2017)
+* [CB-13674](https://issues.apache.org/jira/browse/CB-13674): updated dependencies
+
 ### 2.2.0 (Nov 22, 2017)
 * [CB-13471](https://issues.apache.org/jira/browse/CB-13471) File Provider fix belongs in cordova-common 
 * [CB-11244](https://issues.apache.org/jira/browse/CB-11244) Spot fix for upcoming `cordova-android@7` changes. https://github.com/apache/cordova-android/pull/389
--- a/node_modules/cordova-common/package.json
+++ b/node_modules/cordova-common/package.json
@@ -10,17 +10,17 @@
        "spec": ">=2.2.0 <3.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android"
+      "/Users/steveng/repo/cordova/cordova-android"
    ]
  ],
  "_from": "cordova-common@>=2.2.0 <3.0.0",
-  "_id": "cordova-common@2.2.0",
+  "_id": "cordova-common@2.2.1",
  "_inCache": true,
  "_location": "/cordova-common",
-  "_nodeVersion": "6.6.0",
+  "_nodeVersion": "8.9.3",
  "_npmOperationalInternal": {
    "host": "s3://npm-registry-packages",
-    "tmp": "tmp/cordova-common-2.2.0.tgz_1511807085778_0.6969101736322045"
+    "tmp": "tmp/cordova-common-2.2.1.tgz_1513711030961_0.7797101123724133"
  },
  "_npmUser": {
    "name": "stevegill",
@@ -40,11 +40,11 @@
  "_requiredBy": [
    "/"
  ],
-  "_resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.0.tgz",
-  "_shasum": "0d00f5bcd2bc6c7d06b1ddc0328aea3fe38bcf07",
+  "_resolved": "file:cordova-dist/tools/cordova-common-2.2.1.tgz",
+  "_shasum": "7009bc591729caa7285a588cfd6a7b54cd834f0c",
  "_shrinkwrap": null,
  "_spec": "cordova-common@^2.2.0",
-  "_where": "/Users/jbowser/cordova/cordova-android",
+  "_where": "/Users/steveng/repo/cordova/cordova-android",
  "author": {
    "name": "Apache Software Foundation"
  },
@@ -84,8 +84,8 @@
  },
  "directories": {},
  "dist": {
-    "shasum": "0d00f5bcd2bc6c7d06b1ddc0328aea3fe38bcf07",
-    "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.0.tgz"
+    "shasum": "7009bc591729caa7285a588cfd6a7b54cd834f0c",
+    "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz"
  },
  "engines": {
    "node": ">=4.0.0"
@@ -144,5 +144,5 @@
    "jasmine": "jasmine JASMINE_CONFIG_PATH=spec/support/jasmine.json",
    "test": "npm run eslint && npm run jasmine"
  },
-  "version": "2.2.0"
+  "version": "2.2.1"
 }
--- a/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js
+++ b/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js
@@ -32,7 +32,7 @@
 var path = require('path');
 var et = require('elementtree');
 var ConfigKeeper = require('./ConfigKeeper');
-var CordovaLogger = require('../CordovaLogger');
+var events = require('../events');

 var mungeutil = require('./munge-util');
 var xml_helpers = require('../util/xml-helpers');
@@ -134,7 +134,7 @@ function add_plugin_changes (pluginInfo, plugin_vars, is_top_level, should_incre
                ' cannot be added. <edit-config> changes in this plugin conflicts with <edit-config> changes in config.xml. Conflicts must be resolved before plugin can be added.');
        }
        if (plugin_force) {
-            CordovaLogger.get().log(CordovaLogger.WARN, '--force is used. edit-config will overwrite conflicts if any. Conflicting plugins may not work as expected.');
+            events.emit('warn', '--force is used. edit-config will overwrite conflicts if any. Conflicting plugins may not work as expected.');

            // remove conflicting munges
            var conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.conflictingMunge);
@@ -198,7 +198,7 @@ function add_config_changes (config, should_increment) {
                }
            }
            if (Object.keys(isConflictingInfo.conflictingMunge.files).length !== 0) {
-                CordovaLogger.get().log(CordovaLogger.WARN, 'Conflict found, edit-config changes from config.xml will overwrite plugin.xml changes');
+                events.emit('warn', 'Conflict found, edit-config changes from config.xml will overwrite plugin.xml changes');

                // remove conflicting plugin.xml munges
                conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.conflictingMunge);
--- a/node_modules/cordova-common/src/ConfigParser/ConfigParser.js
+++ b/node_modules/cordova-common/src/ConfigParser/ConfigParser.js
@@ -31,7 +31,7 @@ function ConfigParser (path) {
        this.cdvNamespacePrefix = getCordovaNamespacePrefix(this.doc);
        et.register_namespace(this.cdvNamespacePrefix, 'http://cordova.apache.org/ns/1.0');
    } catch (e) {
-        console.error('Parsing ' + path + ' failed');
+        events.emit('error', 'Parsing ' + path + ' failed');
        throw e;
    }
    var r = this.doc.getroot();
--- a/node_modules/cordova-registry-mapper/package.json
+++ b/node_modules/cordova-registry-mapper/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.1.8 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
    ]
  ],
  "_from": "cordova-registry-mapper@>=1.1.8 <2.0.0",
@@ -36,11 +36,11 @@
  "_requiredBy": [
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz",
+  "_resolved": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz",
  "_shasum": "e244b9185b8175473bff6079324905115f83dc7c",
  "_shrinkwrap": null,
  "_spec": "cordova-registry-mapper@^1.1.8",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
    "name": "Steve Gill"
  },
--- a/node_modules/elementtree/package.json
+++ b/node_modules/elementtree/package.json
@@ -10,7 +10,7 @@
        "spec": "0.1.6",
        "type": "version"
      },
-      "/Users/jbowser/cordova/cordova-android"
+      "/Users/steveng/repo/cordova/cordova-android"
    ]
  ],
  "_from": "elementtree@0.1.6",
@@ -36,11 +36,11 @@
    "/",
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
+  "_resolved": "http://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
  "_shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c",
  "_shrinkwrap": null,
  "_spec": "elementtree@0.1.6",
-  "_where": "/Users/jbowser/cordova/cordova-android",
+  "_where": "/Users/steveng/repo/cordova/cordova-android",
  "author": {
    "name": "Rackspace US, Inc."
  },
--- a/node_modules/glob/package.json
+++ b/node_modules/glob/package.json
@@ -10,7 +10,7 @@
        "spec": ">=5.0.13 <6.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
    ]
  ],
  "_from": "glob@>=5.0.13 <6.0.0",
@@ -36,11 +36,11 @@
  "_requiredBy": [
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+  "_resolved": "http://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
  "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
  "_shrinkwrap": null,
  "_spec": "glob@^5.0.13",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
--- a/node_modules/inflight/package.json
+++ b/node_modules/inflight/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.0.4 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/glob"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/glob"
    ]
  ],
  "_from": "inflight@>=1.0.4 <2.0.0",
@@ -40,11 +40,11 @@
  "_requiredBy": [
    "/glob"
  ],
-  "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+  "_resolved": "http://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
  "_shasum": "49bd6331d7d02d0c09bc910a1075ba8165b56df9",
  "_shrinkwrap": null,
  "_spec": "inflight@^1.0.4",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/glob",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
--- a/node_modules/inherits/package.json
+++ b/node_modules/inherits/package.json
@@ -10,7 +10,7 @@
        "spec": ">=2.0.0 <3.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/glob"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/glob"
    ]
  ],
  "_from": "inherits@>=2.0.0 <3.0.0",
@@ -40,11 +40,11 @@
  "_requiredBy": [
    "/glob"
  ],
-  "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+  "_resolved": "http://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
  "_shasum": "633c2c83e3da42a502f52466022480f4208261de",
  "_shrinkwrap": null,
  "_spec": "inherits@2",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/glob",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob",
  "browser": "./inherits_browser.js",
  "bugs": {
    "url": "https://github.com/isaacs/inherits/issues"
--- a/node_modules/lodash/package.json
+++ b/node_modules/lodash/package.json
@@ -10,7 +10,7 @@
        "spec": ">=3.5.0 <4.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/xmlbuilder"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/xmlbuilder"
    ]
  ],
  "_from": "lodash@>=3.5.0 <4.0.0",
@@ -36,11 +36,11 @@
  "_requiredBy": [
    "/xmlbuilder"
  ],
-  "_resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+  "_resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
  "_shasum": "5bf45e8e49ba4189e17d482789dfd15bd140b7b6",
  "_shrinkwrap": null,
  "_spec": "lodash@^3.5.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/xmlbuilder",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/xmlbuilder",
  "author": {
    "name": "John-David Dalton",
    "email": "john.david.dalton@gmail.com",
--- a/node_modules/minimatch/package.json
+++ b/node_modules/minimatch/package.json
@@ -10,7 +10,7 @@
        "spec": ">=3.0.0 <4.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
    ]
  ],
  "_from": "minimatch@>=3.0.0 <4.0.0",
@@ -45,7 +45,7 @@
  "_shasum": "5166e286457f03306064be5497e8dbb0c3d32083",
  "_shrinkwrap": null,
  "_spec": "minimatch@^3.0.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
--- a/node_modules/nopt/package.json
+++ b/node_modules/nopt/package.json
@@ -10,7 +10,7 @@
        "spec": ">=3.0.1 <4.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android"
+      "/Users/steveng/repo/cordova/cordova-android"
    ]
  ],
  "_from": "nopt@>=3.0.1 <4.0.0",
@@ -36,11 +36,11 @@
  "_requiredBy": [
    "/"
  ],
-  "_resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+  "_resolved": "http://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
  "_shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9",
  "_shrinkwrap": null,
  "_spec": "nopt@^3.0.1",
-  "_where": "/Users/jbowser/cordova/cordova-android",
+  "_where": "/Users/steveng/repo/cordova/cordova-android",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
--- a/node_modules/once/package.json
+++ b/node_modules/once/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.3.0 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/glob"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/glob"
    ]
  ],
  "_from": "once@>=1.3.0 <2.0.0",
@@ -41,11 +41,11 @@
    "/glob",
    "/inflight"
  ],
-  "_resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+  "_resolved": "http://registry.npmjs.org/once/-/once-1.4.0.tgz",
  "_shasum": "583b1aa775961d4b113ac17d9c50baef9dd76bd1",
  "_shrinkwrap": null,
  "_spec": "once@^1.3.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/glob",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
--- a/node_modules/os-homedir/package.json
+++ b/node_modules/os-homedir/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.0.0 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/osenv"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv"
    ]
  ],
  "_from": "os-homedir@>=1.0.0 <2.0.0",
@@ -40,11 +40,11 @@
  "_requiredBy": [
    "/osenv"
  ],
-  "_resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+  "_resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
  "_shasum": "ffbc4988336e0e833de0c168c7ef152121aa7fb3",
  "_shrinkwrap": null,
  "_spec": "os-homedir@^1.0.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/osenv",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv",
  "author": {
    "name": "Sindre Sorhus",
    "email": "sindresorhus@gmail.com",
--- a/node_modules/os-tmpdir/package.json
+++ b/node_modules/os-tmpdir/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.0.0 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/osenv"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv"
    ]
  ],
  "_from": "os-tmpdir@>=1.0.0 <2.0.0",
@@ -40,11 +40,11 @@
  "_requiredBy": [
    "/osenv"
  ],
-  "_resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+  "_resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
  "_shasum": "bbe67406c79aa85c5cfec766fe5734555dfa1274",
  "_shrinkwrap": null,
  "_spec": "os-tmpdir@^1.0.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/osenv",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv",
  "author": {
    "name": "Sindre Sorhus",
    "email": "sindresorhus@gmail.com",
--- a/node_modules/osenv/.npmignore
+++ b/node_modules/osenv/.npmignore
@@ -1,13 +0,0 @@
-*.swp
-.*.swp
-
-.DS_Store
-*~
-.project
-.settings
-npm-debug.log
-coverage.html
-.idea
-lib-cov
-
-node_modules
--- a/node_modules/osenv/.travis.yml
+++ b/node_modules/osenv/.travis.yml
@@ -1,9 +0,0 @@
-language: node_js
-language: node_js
-node_js:
-  - '0.8'
-  - '0.10'
-  - '0.12'
-  - 'iojs'
-before_install:
-  - npm install -g npm@latest
--- a/node_modules/osenv/package.json
+++ b/node_modules/osenv/package.json
@@ -10,23 +10,23 @@
        "spec": ">=0.1.3 <0.2.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
    ]
  ],
  "_from": "osenv@>=0.1.3 <0.2.0",
-  "_id": "osenv@0.1.4",
+  "_id": "osenv@0.1.5",
  "_inCache": true,
  "_location": "/osenv",
-  "_nodeVersion": "6.5.0",
+  "_nodeVersion": "8.9.1",
  "_npmOperationalInternal": {
-    "host": "packages-18-east.internal.npmjs.com",
-    "tmp": "tmp/osenv-0.1.4.tgz_1481655889868_0.3980878754518926"
+    "host": "s3://npm-registry-packages",
+    "tmp": "tmp/osenv_0.1.5_1518743366771_0.010286411112286009"
  },
  "_npmUser": {
    "name": "isaacs",
    "email": "i@izs.me"
  },
-  "_npmVersion": "3.10.9",
+  "_npmVersion": "5.6.0-canary.11",
  "_phantomChildren": {},
  "_requested": {
    "raw": "osenv@^0.1.3",
@@ -40,11 +40,11 @@
  "_requiredBy": [
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-  "_shasum": "42fe6d5953df06c8064be6f176c3d05aaaa34644",
+  "_resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+  "_shasum": "85cdfafaeb28e8677f416e287592b5f3f49ea410",
  "_shrinkwrap": null,
  "_spec": "osenv@^0.1.3",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
@@ -59,16 +59,22 @@
  },
  "description": "Look up environment settings specific to different operating systems",
  "devDependencies": {
-    "tap": "^8.0.1"
+    "tap": "^11.1.0"
  },
  "directories": {
    "test": "test"
  },
  "dist": {
-    "shasum": "42fe6d5953df06c8064be6f176c3d05aaaa34644",
-    "tarball": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"
+    "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+    "shasum": "85cdfafaeb28e8677f416e287592b5f3f49ea410",
+    "tarball": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+    "fileCount": 4,
+    "unpackedSize": 4889
  },
-  "gitHead": "ef718f0d20e38d45ec452b7faeefc692d3cd1062",
+  "files": [
+    "osenv.js"
+  ],
+  "gitHead": "1c642b8f5ddb1f99671a300a466bf42ffb9f5ea2",
  "homepage": "https://github.com/npm/osenv#readme",
  "keywords": [
    "environment",
@@ -83,20 +89,20 @@
  "main": "osenv.js",
  "maintainers": [
    {
-      "name": "isaacs",
-      "email": "i@izs.me"
+      "name": "iarna",
+      "email": "me@re-becca.org"
    },
    {
-      "name": "robertkowalski",
-      "email": "rok@kowalski.gd"
+      "name": "isaacs",
+      "email": "i@izs.me"
    },
    {
      "name": "othiym23",
      "email": "ogd@aoaioxxysz.net"
    },
    {
-      "name": "iarna",
-      "email": "me@re-becca.org"
+      "name": "robertkowalski",
+      "email": "rok@kowalski.gd"
    }
  ],
  "name": "osenv",
@@ -107,7 +113,10 @@
    "url": "git+https://github.com/npm/osenv.git"
  },
  "scripts": {
+    "postpublish": "git push origin --all; git push origin --tags",
+    "postversion": "npm publish",
+    "preversion": "npm test",
    "test": "tap test/*.js"
  },
-  "version": "0.1.4"
+  "version": "0.1.5"
 }
--- a/node_modules/osenv/test/unix.js
+++ b/node_modules/osenv/test/unix.js
@@ -1,71 +0,0 @@
-// only run this test on windows
-// pretending to be another platform is too hacky, since it breaks
-// how the underlying system looks up module paths and runs
-// child processes, and all that stuff is cached.
-var tap = require('tap')
-
-
-if (process.platform === 'win32') {
-  tap.plan(0, 'Skip unix tests, this is not unix')
-  process.exit(0)
-}
-
-// like unix, but funny
-process.env.USER = 'sirUser'
-process.env.HOME = '/home/sirUser'
-process.env.HOSTNAME = 'my-machine'
-process.env.TMPDIR = '/tmpdir'
-process.env.TMP = '/tmp'
-process.env.TEMP = '/temp'
-process.env.PATH = '/opt/local/bin:/usr/local/bin:/usr/bin/:bin'
-process.env.PS1 = '(o_o) $ '
-process.env.EDITOR = 'edit'
-process.env.VISUAL = 'visualedit'
-process.env.SHELL = 'zsh'
-
-tap.test('basic unix sanity test', function (t) {
-  var osenv = require('../osenv.js')
-
-  t.equal(osenv.user(), process.env.USER)
-  t.equal(osenv.home(), process.env.HOME)
-  t.equal(osenv.hostname(), process.env.HOSTNAME)
-  t.same(osenv.path(), process.env.PATH.split(':'))
-  t.equal(osenv.prompt(), process.env.PS1)
-  t.equal(osenv.tmpdir(), process.env.TMPDIR)
-
-  // mildly evil, but it's for a test.
-  process.env.TMPDIR = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.tmpdir(), process.env.TMP)
-
-  process.env.TMP = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.tmpdir(), process.env.TEMP)
-
-  process.env.TEMP = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  osenv.home = function () { return null }
-  t.equal(osenv.tmpdir(), '/tmp')
-
-  t.equal(osenv.editor(), 'edit')
-  process.env.EDITOR = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.editor(), 'visualedit')
-
-  process.env.VISUAL = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.editor(), 'vi')
-
-  t.equal(osenv.shell(), 'zsh')
-  process.env.SHELL = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.shell(), 'bash')
-
-  t.end()
-})
--- a/node_modules/osenv/test/windows.js
+++ b/node_modules/osenv/test/windows.js
@@ -1,74 +0,0 @@
-// only run this test on windows
-// pretending to be another platform is too hacky, since it breaks
-// how the underlying system looks up module paths and runs
-// child processes, and all that stuff is cached.
-if (process.platform !== 'win32') {
-  console.log('TAP version 13\n' +
-              '1..0 # Skip windows tests, this is not windows\n')
-  return
-}
-
-// load this before clubbing the platform name.
-var tap = require('tap')
-
-process.env.windir = 'c:\\windows'
-process.env.USERDOMAIN = 'some-domain'
-process.env.USERNAME = 'sirUser'
-process.env.USERPROFILE = 'C:\\Users\\sirUser'
-process.env.COMPUTERNAME = 'my-machine'
-process.env.TMPDIR = 'C:\\tmpdir'
-process.env.TMP = 'C:\\tmp'
-process.env.TEMP = 'C:\\temp'
-process.env.Path = 'C:\\Program Files\\;C:\\Binary Stuff\\bin'
-process.env.PROMPT = '(o_o) $ '
-process.env.EDITOR = 'edit'
-process.env.VISUAL = 'visualedit'
-process.env.ComSpec = 'some-com'
-
-tap.test('basic windows sanity test', function (t) {
-  var osenv = require('../osenv.js')
-
-  t.equal(osenv.user(),
-          process.env.USERDOMAIN + '\\' + process.env.USERNAME)
-  t.equal(osenv.home(), process.env.USERPROFILE)
-  t.equal(osenv.hostname(), process.env.COMPUTERNAME)
-  t.same(osenv.path(), process.env.Path.split(';'))
-  t.equal(osenv.prompt(), process.env.PROMPT)
-  t.equal(osenv.tmpdir(), process.env.TMPDIR)
-
-  // mildly evil, but it's for a test.
-  process.env.TMPDIR = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.tmpdir(), process.env.TMP)
-
-  process.env.TMP = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.tmpdir(), process.env.TEMP)
-
-  process.env.TEMP = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  osenv.home = function () { return null }
-  t.equal(osenv.tmpdir(), 'c:\\windows\\temp')
-
-  t.equal(osenv.editor(), 'edit')
-  process.env.EDITOR = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.editor(), 'visualedit')
-
-  process.env.VISUAL = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.editor(), 'notepad.exe')
-
-  t.equal(osenv.shell(), 'some-com')
-  process.env.ComSpec = ''
-  delete require.cache[require.resolve('../osenv.js')]
-  var osenv = require('../osenv.js')
-  t.equal(osenv.shell(), 'cmd')
-
-  t.end()
-})
--- a/node_modules/osenv/x.tap
+++ b/node_modules/osenv/x.tap
@@ -1,39 +0,0 @@
-TAP version 13
-    # Subtest: test/unix.js
-    TAP version 13
-        # Subtest: basic unix sanity test
-        ok 1 - should be equal
-        ok 2 - should be equal
-        ok 3 - should be equal
-        ok 4 - should be equivalent
-        ok 5 - should be equal
-        ok 6 - should be equal
-        ok 7 - should be equal
-        ok 8 - should be equal
-        ok 9 - should be equal
-        ok 10 - should be equal
-        ok 11 - should be equal
-        ok 12 - should be equal
-        ok 13 - should be equal
-        ok 14 - should be equal
-        1..14
-    ok 1 - basic unix sanity test # time=10.712ms
-
-    1..1
-    # time=18.422ms
-ok 1 - test/unix.js # time=169.827ms
-
-    # Subtest: test/windows.js
-    TAP version 13
-    1..0 # Skip windows tests, this is not windows
-
-ok 2 - test/windows.js # SKIP Skip windows tests, this is not windows
-
-    # Subtest: test/nada.js
-    TAP version 13
-    1..0
-
-ok 2 - test/nada.js
-
-1..3
-# time=274.247ms
--- a/node_modules/path-is-absolute/package.json
+++ b/node_modules/path-is-absolute/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.0.0 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/glob"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/glob"
    ]
  ],
  "_from": "path-is-absolute@>=1.0.0 <2.0.0",
@@ -40,11 +40,11 @@
  "_requiredBy": [
    "/glob"
  ],
-  "_resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+  "_resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
  "_shasum": "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f",
  "_shrinkwrap": null,
  "_spec": "path-is-absolute@^1.0.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/glob",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob",
  "author": {
    "name": "Sindre Sorhus",
    "email": "sindresorhus@gmail.com",
--- a/node_modules/plist/package.json
+++ b/node_modules/plist/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.2.0 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
    ]
  ],
  "_from": "plist@>=1.2.0 <2.0.0",
@@ -36,11 +36,11 @@
  "_requiredBy": [
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz",
+  "_resolved": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz",
  "_shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593",
  "_shrinkwrap": null,
  "_spec": "plist@^1.2.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
    "name": "Nathan Rajlich",
    "email": "nathan@tootallnate.net"
--- a/node_modules/properties-parser/package.json
+++ b/node_modules/properties-parser/package.json
@@ -10,7 +10,7 @@
        "spec": ">=0.2.3 <0.3.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android"
+      "/Users/steveng/repo/cordova/cordova-android"
    ]
  ],
  "_from": "properties-parser@>=0.2.3 <0.3.0",
@@ -35,11 +35,11 @@
  "_requiredBy": [
    "/"
  ],
-  "_resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz",
+  "_resolved": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz",
  "_shasum": "f7591255f707abbff227c7b56b637dbb0373a10f",
  "_shrinkwrap": null,
  "_spec": "properties-parser@^0.2.3",
-  "_where": "/Users/jbowser/cordova/cordova-android",
+  "_where": "/Users/steveng/repo/cordova/cordova-android",
  "bugs": {
    "url": "https://github.com/xavi-/node-properties-parser/issues"
  },
--- a/node_modules/q/package.json
+++ b/node_modules/q/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.4.1 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android"
+      "/Users/steveng/repo/cordova/cordova-android"
    ]
  ],
  "_from": "q@>=1.4.1 <2.0.0",
@@ -45,7 +45,7 @@
  "_shasum": "7e32f75b41381291d04611f1bf14109ac00651d7",
  "_shrinkwrap": null,
  "_spec": "q@^1.4.1",
-  "_where": "/Users/jbowser/cordova/cordova-android",
+  "_where": "/Users/steveng/repo/cordova/cordova-android",
  "author": {
    "name": "Kris Kowal",
    "email": "kris@cixar.com",
--- a/node_modules/sax/package.json
+++ b/node_modules/sax/package.json
@@ -10,7 +10,7 @@
        "spec": "0.3.5",
        "type": "version"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/elementtree"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/elementtree"
    ]
  ],
  "_defaultsLoaded": true,
@@ -42,7 +42,7 @@
  "_shasum": "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d",
  "_shrinkwrap": null,
  "_spec": "sax@0.3.5",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/elementtree",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/elementtree",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
--- a/node_modules/semver/README.md
+++ b/node_modules/semver/README.md
@@ -20,6 +20,8 @@ semver.clean('  =v1.2.3   ') // '1.2.3'
 semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true
 semver.gt('1.2.3', '9.8.7') // false
 semver.lt('1.2.3', '9.8.7') // true
+semver.valid(semver.coerce('v2')) // '2.0.0'
+semver.valid(semver.coerce('42.6.7.9.3-alpha')) // '42.6.7'
 ```

 As a command-line utility:
@@ -52,6 +54,10 @@ Options:
 -l --loose
        Interpret versions and ranges loosely

+-c --coerce
+        Coerce a string into SemVer if possible
+        (does not imply --loose)
+
 Program exits successfully if any valid version satisfies
 all supplied ranges, and prints all satisfying versions.

@@ -364,3 +370,19 @@ satisfy the range.

 If you want to know if a version satisfies or does not satisfy a
 range, use the `satisfies(version, range)` function.
+
+### Coercion
+
+* `coerce(version)`: Coerces a string to semver if possible
+
+This aims to provide a very forgiving translation of a non-semver
+string to semver. It looks for the first digit in a string, and
+consumes all remaining characters which satisfy at least a partial semver
+(e.g., `1`, `1.2`, `1.2.3`) up to the max permitted length (256 characters).
+Longer versions are simply truncated (`4.6.3.9.2-alpha2` becomes `4.6.3`).
+All surrounding text is simply ignored (`v3.4 replaces v3.3.1` becomes `3.4.0`).
+Only text which lacks digits will fail coercion (`version one` is not valid).
+The maximum  length for any semver component considered for coercion is 16 characters;
+longer components will be ignored (`10000000000000000.4.7.4` becomes `4.7.4`).
+The maximum value for any semver component is `Integer.MAX_SAFE_INTEGER || (2**53 - 1)`;
+higher value components are invalid (`9999999999999999.4.7.4` is likely invalid).
--- a/node_modules/semver/bin/semver
+++ b/node_modules/semver/bin/semver
@@ -12,6 +12,7 @@ var argv = process.argv.slice(2)
  , inc = null
  , version = require("../package.json").version
  , loose = false
+  , coerce = false
  , identifier = undefined
  , semver = require("../semver")
  , reverse = false
@@ -54,6 +55,9 @@ function main () {
      case "-r": case "--range":
        range.push(argv.shift())
        break
+      case "-c": case "--coerce":
+        coerce = true
+        break
      case "-h": case "--help": case "-?":
        return help()
      default:
@@ -62,8 +66,10 @@ function main () {
    }
  }

-  versions = versions.filter(function (v) {
-    return semver.valid(v, loose)
+  versions = versions.map(function (v) {
+    return coerce ? (semver.coerce(v) || {version: v}).version : v
+  }).filter(function (v) {
+    return semver.valid(v)
  })
  if (!versions.length) return fail()
  if (inc && (versions.length !== 1 || range.length))
@@ -122,6 +128,10 @@ function help () {
              ,"-l --loose"
              ,"        Interpret versions and ranges loosely"
              ,""
+              ,"-c --coerce"
+              ,"        Coerce a string into SemVer if possible"
+              ,"        (does not imply --loose)"
+              ,""
              ,"Program exits successfully if any valid version satisfies"
              ,"all supplied ranges, and prints all satisfying versions."
              ,""
--- a/node_modules/semver/package.json
+++ b/node_modules/semver/package.json
@@ -2,49 +2,50 @@
  "_args": [
    [
      {
-        "raw": "semver@^5.0.1",
+        "raw": "semver@^5.4.1",
        "scope": null,
        "escapedName": "semver",
        "name": "semver",
-        "rawSpec": "^5.0.1",
-        "spec": ">=5.0.1 <6.0.0",
+        "rawSpec": "^5.4.1",
+        "spec": ">=5.4.1 <6.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/android-versions"
    ]
  ],
-  "_from": "semver@>=5.0.1 <6.0.0",
-  "_id": "semver@5.4.1",
+  "_from": "semver@>=5.4.1 <6.0.0",
+  "_id": "semver@5.5.0",
  "_inCache": true,
  "_location": "/semver",
-  "_nodeVersion": "8.2.1",
+  "_nodeVersion": "8.9.1",
  "_npmOperationalInternal": {
    "host": "s3://npm-registry-packages",
-    "tmp": "tmp/semver-5.4.1.tgz_1500922107643_0.5125251261051744"
+    "tmp": "tmp/semver-5.5.0.tgz_1516130879707_0.30317740654572845"
  },
  "_npmUser": {
    "name": "isaacs",
    "email": "i@izs.me"
  },
-  "_npmVersion": "5.3.0",
+  "_npmVersion": "5.6.0",
  "_phantomChildren": {},
  "_requested": {
-    "raw": "semver@^5.0.1",
+    "raw": "semver@^5.4.1",
    "scope": null,
    "escapedName": "semver",
    "name": "semver",
-    "rawSpec": "^5.0.1",
-    "spec": ">=5.0.1 <6.0.0",
+    "rawSpec": "^5.4.1",
+    "spec": ">=5.4.1 <6.0.0",
    "type": "range"
  },
  "_requiredBy": [
+    "/android-versions",
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-  "_shasum": "e059c09d8571f0540823733433505d3a2f00b18e",
+  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+  "_shasum": "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab",
  "_shrinkwrap": null,
-  "_spec": "semver@^5.0.1",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_spec": "semver@^5.4.1",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/android-versions",
  "bin": {
    "semver": "./bin/semver"
  },
@@ -58,16 +59,16 @@
  },
  "directories": {},
  "dist": {
-    "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-    "shasum": "e059c09d8571f0540823733433505d3a2f00b18e",
-    "tarball": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"
+    "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+    "shasum": "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab",
+    "tarball": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"
  },
  "files": [
    "bin",
    "range.bnf",
    "semver.js"
  ],
-  "gitHead": "0877c942a6af00edcda5c16fdd934684e1b20a1c",
+  "gitHead": "44cbc8482ac4f0f8d2de0abb7f8808056d2d55f9",
  "homepage": "https://github.com/npm/node-semver#readme",
  "license": "ISC",
  "main": "semver.js",
@@ -91,5 +92,5 @@
  "scripts": {
    "test": "tap test/*.js --cov -J"
  },
-  "version": "5.4.1"
+  "version": "5.5.0"
 }
--- a/node_modules/semver/range.bnf
+++ b/node_modules/semver/range.bnf
@@ -3,10 +3,10 @@ logical-or ::= ( ' ' ) * '||' ( ' ' ) *
 range      ::= hyphen | simple ( ' ' simple ) * | ''
 hyphen     ::= partial ' - ' partial
 simple     ::= primitive | partial | tilde | caret
-primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
+primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' ) partial
 partial    ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
 xr         ::= 'x' | 'X' | '*' | nr
-nr         ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
+nr         ::= '0' | [1-9] ( [0-9] ) *
 tilde      ::= '~' partial
 caret      ::= '^' partial
 qualifier  ::= ( '-' pre )? ( '+' build )?
--- a/node_modules/semver/semver.js
+++ b/node_modules/semver/semver.js
@@ -21,6 +21,9 @@ exports.SEMVER_SPEC_VERSION = '2.0.0';
 var MAX_LENGTH = 256;
 var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;

+// Max safe segment length for coercion.
+var MAX_SAFE_COMPONENT_LENGTH = 16;
+
 // The actual regexps go on exports.re
 var re = exports.re = [];
 var src = exports.src = [];
@@ -156,6 +159,15 @@ src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
 var XRANGELOOSE = R++;
 src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';

+// Coercion.
+// Extract anything that could conceivably be a part of a valid semver
+var COERCE = R++;
+src[COERCE] = '(?:^|[^\\d])' +
+              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+              '(?:$|[^\\d])';
+
 // Tilde ranges.
 // Meaning is "reasonably at or greater than"
 var LONETILDE = R++;
@@ -1294,3 +1306,19 @@ function intersects(r1, r2, loose) {
  r2 = new Range(r2, loose)
  return r1.intersects(r2)
 }
+
+exports.coerce = coerce;
+function coerce(version) {
+  if (version instanceof SemVer)
+    return version;
+
+  if (typeof version !== 'string')
+    return null;
+
+  var match = version.match(re[COERCE]);
+
+  if (match == null)
+    return null;
+
+  return parse((match[1] || '0') + '.' + (match[2] || '0') + '.' + (match[3] || '0')); 
+}
--- a/node_modules/shelljs/package.json
+++ b/node_modules/shelljs/package.json
@@ -10,7 +10,7 @@
        "spec": ">=0.5.3 <0.6.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android"
+      "/Users/steveng/repo/cordova/cordova-android"
    ]
  ],
  "_from": "shelljs@>=0.5.3 <0.6.0",
@@ -37,11 +37,11 @@
    "/",
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+  "_resolved": "http://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
  "_shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113",
  "_shrinkwrap": null,
  "_spec": "shelljs@^0.5.3",
-  "_where": "/Users/jbowser/cordova/cordova-android",
+  "_where": "/Users/steveng/repo/cordova/cordova-android",
  "author": {
    "name": "Artur Adib",
    "email": "arturadib@gmail.com"
--- a/node_modules/underscore/package.json
+++ b/node_modules/underscore/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.8.3 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
    ]
  ],
  "_from": "underscore@>=1.8.3 <2.0.0",
@@ -35,11 +35,11 @@
  "_requiredBy": [
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+  "_resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
  "_shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022",
  "_shrinkwrap": null,
  "_spec": "underscore@^1.8.3",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
    "name": "Jeremy Ashkenas",
    "email": "jeremy@documentcloud.org"
--- a/node_modules/unorm/package.json
+++ b/node_modules/unorm/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.3.3 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
    ]
  ],
  "_from": "unorm@>=1.3.3 <2.0.0",
@@ -35,11 +35,11 @@
  "_requiredBy": [
    "/cordova-common"
  ],
-  "_resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
+  "_resolved": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
  "_shasum": "364200d5f13646ca8bcd44490271335614792300",
  "_shrinkwrap": null,
  "_spec": "unorm@^1.3.3",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
    "name": "Bjarke Walling",
    "email": "bwp@bwp.dk"
--- a/node_modules/util-deprecate/package.json
+++ b/node_modules/util-deprecate/package.json
@@ -10,7 +10,7 @@
        "spec": "1.0.2",
        "type": "version"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/plist"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/plist"
    ]
  ],
  "_from": "util-deprecate@1.0.2",
@@ -40,7 +40,7 @@
  "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
  "_shrinkwrap": null,
  "_spec": "util-deprecate@1.0.2",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/plist",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist",
  "author": {
    "name": "Nathan Rajlich",
    "email": "nathan@tootallnate.net",
--- a/node_modules/wrappy/package.json
+++ b/node_modules/wrappy/package.json
@@ -10,7 +10,7 @@
        "spec": ">=1.0.0 <2.0.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/inflight"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/inflight"
    ]
  ],
  "_from": "wrappy@>=1.0.0 <2.0.0",
@@ -41,11 +41,11 @@
    "/inflight",
    "/once"
  ],
-  "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+  "_resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
  "_shasum": "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f",
  "_shrinkwrap": null,
  "_spec": "wrappy@1",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/inflight",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/inflight",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
--- a/node_modules/xmlbuilder/package.json
+++ b/node_modules/xmlbuilder/package.json
@@ -10,7 +10,7 @@
        "spec": "4.0.0",
        "type": "version"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/plist"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/plist"
    ]
  ],
  "_from": "xmlbuilder@4.0.0",
@@ -39,7 +39,7 @@
  "_shasum": "98b8f651ca30aa624036f127d11cc66dc7b907a3",
  "_shrinkwrap": null,
  "_spec": "xmlbuilder@4.0.0",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/plist",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist",
  "author": {
    "name": "Ozgur Ozcitak",
    "email": "oozcitak@gmail.com"
--- a/node_modules/xmldom/package.json
+++ b/node_modules/xmldom/package.json
@@ -10,7 +10,7 @@
        "spec": ">=0.1.0 <0.2.0",
        "type": "range"
      },
-      "/Users/jbowser/cordova/cordova-android/node_modules/plist"
+      "/Users/steveng/repo/cordova/cordova-android/node_modules/plist"
    ]
  ],
  "_from": "xmldom@>=0.1.0 <0.2.0",
@@ -40,11 +40,11 @@
  "_requiredBy": [
    "/plist"
  ],
-  "_resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+  "_resolved": "http://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
  "_shasum": "d501f97b3bdb403af8ef9ecc20573187aadac0e9",
  "_shrinkwrap": null,
  "_spec": "xmldom@0.1.x",
-  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/plist",
+  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist",
  "author": {
    "name": "jindw",
    "email": "jindw@xidea.org",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cordova-android",
-  "version": "7.0.0",
+  "version": "7.1.0",
  "description": "cordova-android release",
  "bin": {
    "create": "bin/create"
@@ -29,7 +29,7 @@
  "author": "Apache Software Foundation",
  "license": "Apache-2.0",
  "dependencies": {
-    "android-versions": "^1.2.1",
+    "android-versions": "^1.3.0",
    "cordova-common": "^2.2.0",
    "elementtree": "0.1.6",
    "nopt": "^3.0.1",
--- a/test/app/build.gradle
+++ b/test/app/build.gradle
@@ -19,12 +19,12 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.1"
    defaultConfig {
        applicationId "org.apache.cordova.unittests"
-        minSdkVersion 16
-        targetSdkVersion 26
+        minSdkVersion 19
+        targetSdkVersion 27
        versionCode 1
        versionName "1.0"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -38,12 +38,12 @@ android {
 }

 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(path: ":CordovaLib")
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(path: ':CordovaLib')
    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
        exclude group: 'com.android.support', module: 'support-annotations'
    })
-    androidTestImplementation ('com.android.support.test.espresso:espresso-web:2.2.2', {
+    androidTestImplementation('com.android.support.test.espresso:espresso-web:2.2.2', {
        exclude group: 'com.android.support', module: 'support-annotations'
    })
    implementation 'com.android.support:appcompat-v7:26.1.0'
--- a/test/app/src/test/java/org/apache/cordova/unittests/NativeToJsMessageQueueTest.java
+++ b/test/app/src/test/java/org/apache/cordova/unittests/NativeToJsMessageQueueTest.java
@@ -161,4 +161,17 @@ public class NativeToJsMessageQueueTest {
        assertEquals(result, "cordova.callbackFromNative('37',true,1,[0,1,2,3,4],false);");
    }

+    @Test
+    public void testNullPopAndEncodeAsJs()
+    {
+        NativeToJsMessageQueue queue = new NativeToJsMessageQueue();
+        queue.addBridgeMode(new NativeToJsMessageQueue.NoOpBridgeMode());
+        queue.setBridgeMode(0);
+
+        PluginResult result = new PluginResult(PluginResult.Status.OK, (String)null);
+        queue.addPluginResult(result, TEST_CALLBACK_ID);
+        assertFalse(queue.isEmpty());
+        String resultString = queue.popAndEncodeAsJs();
+        assertEquals(resultString, "cordova.callbackFromNative('" + TEST_CALLBACK_ID + "',true,1,[null],false);");
+    }
 }
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -24,7 +24,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
Author	SHA1	Message	Date
Steve Gill	f7d122bd8e	Set VERSION to 7.1.0 (via coho)	2018-02-21 10:52:01 -08:00
Steve Gill	152984855b	Update JS snapshot to version 7.1.0 (via coho)	2018-02-21 10:52:00 -08:00
Steve Gill	8d9a1b82dd	CB-13912 Updated RELEASENOTES and Version for release 7.1.0	2018-02-21 10:50:50 -08:00
Steve Gill	f1b57dd9b4	CB-13912: updated .ratignore to include build diectory	2018-02-20 11:36:55 -08:00
Steve Gill	d2a0323ae4	CB-13912 Updated checked-in node_modules	2018-02-20 11:17:05 -08:00
Simon MacDonald	3a339ba37f	⬆️ Bump gradle tools dependency to 3.0.1 for project template	2018-02-15 17:42:10 -05:00
Steve Gill	e9603b0738	CB-13879 updated gradle plugin	2018-02-14 16:54:06 -08:00
Joe Bowser	3d83fd784b	Merge pull request #431 from sunday18/patch-1 CB-13818: (android) Update android_sdk.js to support Android Oreo 8.0 (API 26) emulator	2018-01-26 12:32:53 -08:00
Joe Bowser	38a5f891a4	Merge pull request #430 from abernix/abernix/bump-android-versions CB-13831: (android) Update `android-versions` to 1.3.0 to support SDK 27.	2018-01-26 08:02:35 -08:00
sunday18	8563c8beef	Update android_sdk.js Update `android_sdk.js` to support Android Oreo (API 26) emulator	2018-01-26 06:21:53 +00:00
Jesse Rosenberger	f91102ee07	CB-13831: (android) Update `android-versions` to 1.3.0 to support SDK 27. The `android-versions@1.3.0` version now has support for Android SDK level 27 thanks to `230957205e`. As the `android-versions` npm is a "bundled dependency" this will only take effect when a new version of `cordova-android` is published, since bundled dependencies are packed within the npm at publish time, not automatically fetched as dependencies at publish time (which would have normally been covered for new installations of cordova-android@7.0.0 thanks to semver caret notation).	2018-01-25 20:08:10 +02:00
Joe Bowser	cc08e9d84a	Merge pull request #429 from BBosman/cb13800 CB-13800: Drop pre-KitKat specific code	2018-01-19 11:09:40 -08:00
Bas Bosman	075d38117a	CB-13800: (android) Drop pre-KitKat specific code	2018-01-19 13:58:24 +01:00
Joe Bowser	6cc4896690	Merge pull request #426 from infil00p/api_level_bump CB-13724: Bump Target SDK to API 27	2018-01-17 11:48:51 -08:00
Joe Bowser	673a6773b2	Merge pull request #427 from infil00p/deleteDeprecatedNdk CB-13646: End of an era. Using the deprecated NDK by default breaks …	2018-01-10 12:08:46 -08:00
Joe Bowser	3a6923988d	CB-13646: End of an era. Using the deprecated NDK by default breaks the build. Crosswalk users need to specify the Gradle parameters to keep it working.	2018-01-08 14:52:46 -08:00
Joe Bowser	0d1692681f	CB-13724: Updated the Android Tooling required for the latest version on both the test project, and the template	2018-01-04 15:35:04 -08:00
Joe Bowser	fcf705e007	Merge pull request #425 from deton/fix-nullresult-fromthread CB-12218: (android) Fix consistency of null result message	2018-01-03 11:24:24 -08:00
Joe Bowser	5c93c214b9	CB-13724: Bump Target SDK to API 27	2018-01-02 14:38:03 -08:00
Joe Bowser	7cbb8401a2	Merge pull request #422 from themightychris/patch-2 Prevent crash when unrecognized android version encounterd	2018-01-02 14:34:17 -08:00
Joe Bowser	b3c262cd47	Merge pull request #424 from jcesarmobile/CB-13721 CB-13721 (Android): fix build apps that use cdvHelpers.getConfigPreference	2018-01-02 13:41:45 -08:00
KIHARA Hideto	45a7b90c6c	CB-12218: (android) Fix consistency of null result message Fix problem that JavaScript receives ""(empty string) instead of null if plugin sends null result from new thread.	2018-01-02 12:41:17 +09:00
Julio César	e1c3b4fd94	CB-13721 (Android): fix build apps that use cdvHelpers.getConfigPreference	2017-12-30 01:07:45 +01:00
Chris Alfano	109112ae75	CB-13571: (android) Prevent crash with unrecognized android version Fixes issue where commands that list images will crash when an image with a version not present in `android-versions` is encountered, as is presently the case with API 27: ``` cordova run android --list Available android devices: Available android virtual devices: LEVEL: null ERROR: TypeError: Cannot read property 'semver' of null An unexpected error has occured while running list-emulator-images with code 2: Error: /home/chris/Repositories/acp-guidelines/cordova/platforms/android/cordova/lib/list-emulator-images: Command failed with exit code 2 ``` Signed-off-by: Chris Alfano <chris@jarv.us>	2017-12-22 15:56:26 -05:00
Joe Bowser	a24ba41eda	Merge pull request #421 from infil00p/test-sdk-bump CB-12914: Test needs SDK bumps	2017-12-18 12:19:24 -08:00
Joe Bowser	be3f8ef80d	CB-12914: Test needs SDK bumps	2017-12-14 13:48:19 -08:00
Joe Bowser	d50dedb5d0	Merge pull request #420 from infil00p/CB12914 CB-12914: Forgot to bump AndroidManifest.xml for play store reasons	2017-12-14 09:58:18 -08:00
Joe Bowser	74e9e213d6	Forgot to bump AndroidManifest.xml for play store reasons	2017-12-12 12:49:54 -08:00
Joe Bowser	d8d92cae61	CB-13621: eslint error	2017-11-30 11:08:39 -08:00
Joe Bowser	99d5b4d982	CB-13622: Testing commit	2017-11-30 10:56:28 -08:00
Joe Bowser	52fd32c837	CB-13621: Wrote similar warning to CB-12948 on iOS. We no longer support update.	2017-11-30 10:40:07 -08:00
Joe Bowser	061f08bc03	Update JS snapshot to version 7.1.0-dev (via coho)	2017-11-30 10:01:30 -08:00
Joe Bowser	735bc98243	Set VERSION to 7.1.0-dev (via coho)	2017-11-30 10:01:28 -08:00