You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2017/09/25 19:58:27 UTC

[cordova-android] branch master updated (dddb283 -> 7f3be98)

This is an automated email from the ASF dual-hosted git repository.

bowserj pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git.


    from dddb283  CB-6936: Merge pull request #304 from uareurapid/master
     new 97aab90  CB-13323 Updated checked-in node_modules
     new 7203b74  CB-13323 Updated RELEASENOTES and Version for release 6.3.0
     new 0e498db  Set VERSION to 6.4.0-dev (via coho)
     new 7f3be98  Update JS snapshot to version 6.4.0-dev (via coho)

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 RELEASENOTES.md                                    |   17 +
 VERSION                                            |    2 +-
 bin/templates/cordova/version                      |    2 +-
 bin/templates/project/assets/www/cordova.js        | 3871 ++++++++++----------
 framework/build.gradle                             |    6 +-
 .../src/org/apache/cordova/CordovaWebView.java     |    2 +-
 node_modules/abbrev/package.json                   |    9 +-
 node_modules/android-versions/.jshintignore        |    8 +
 node_modules/android-versions/.jshintrc            |   28 +
 .../{concat-map => android-versions}/.travis.yml   |    3 +-
 node_modules/android-versions/README.md            |   87 +
 node_modules/android-versions/index.js             |  153 +
 node_modules/android-versions/package.json         |  103 +
 node_modules/ansi/package.json                     |    9 +-
 node_modules/balanced-match/package.json           |    7 +-
 node_modules/base64-js/package.json                |    9 +-
 node_modules/big-integer/BigInteger.js             |    2 +
 node_modules/big-integer/BigInteger.min.js         |    2 +-
 node_modules/big-integer/package.json              |   23 +-
 node_modules/bplist-parser/package.json            |    9 +-
 node_modules/brace-expansion/package.json          |    7 +-
 node_modules/concat-map/package.json               |   11 +-
 node_modules/cordova-common/package.json           |    7 +-
 node_modules/cordova-registry-mapper/package.json  |    9 +-
 node_modules/elementtree/package.json              |    9 +-
 node_modules/glob/package.json                     |    9 +-
 node_modules/inflight/package.json                 |    9 +-
 node_modules/inherits/package.json                 |    9 +-
 node_modules/lodash/package.json                   |    9 +-
 node_modules/minimatch/package.json                |    7 +-
 node_modules/nopt/package.json                     |    9 +-
 node_modules/once/package.json                     |    9 +-
 node_modules/os-homedir/package.json               |    9 +-
 node_modules/os-tmpdir/package.json                |    9 +-
 node_modules/osenv/package.json                    |    9 +-
 node_modules/path-is-absolute/package.json         |    9 +-
 node_modules/plist/package.json                    |    9 +-
 node_modules/properties-parser/package.json        |   16 +-
 node_modules/q/package.json                        |    9 +-
 node_modules/sax/package.json                      |    7 +-
 node_modules/semver/package.json                   |    7 +-
 node_modules/shelljs/package.json                  |    9 +-
 node_modules/underscore/package.json               |    9 +-
 node_modules/unorm/package.json                    |   11 +-
 node_modules/util-deprecate/package.json           |    7 +-
 node_modules/wrappy/package.json                   |    9 +-
 node_modules/xmlbuilder/package.json               |    7 +-
 node_modules/xmldom/package.json                   |   28 +-
 package.json                                       |    2 +-
 49 files changed, 2511 insertions(+), 2111 deletions(-)
 create mode 100644 node_modules/android-versions/.jshintignore
 create mode 100644 node_modules/android-versions/.jshintrc
 copy node_modules/{concat-map => android-versions}/.travis.yml (62%)
 create mode 100644 node_modules/android-versions/README.md
 create mode 100644 node_modules/android-versions/index.js
 create mode 100644 node_modules/android-versions/package.json

-- 
To stop receiving notification emails like this one, please contact
['"commits@cordova.apache.org" <co...@cordova.apache.org>'].

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-android] 03/04: Set VERSION to 6.4.0-dev (via coho)

Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git

commit 0e498db735c3c07e6850e84e918ec00e5f7ce97d
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Mon Sep 25 11:37:51 2017 -0700

    Set VERSION to 6.4.0-dev (via coho)
---
 VERSION                                              | 2 +-
 bin/templates/cordova/version                        | 2 +-
 framework/build.gradle                               | 6 +++---
 framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
 package.json                                         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index 806c93a..26c70f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.3.0-dev
+6.4.0-dev
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 45dc047..3b4df99 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
 */
 
 // Coho updates this line:
-var VERSION = "6.3.0-dev";
+var VERSION = "6.4.0-dev";
 
 module.exports.version = VERSION;
 
diff --git a/framework/build.gradle b/framework/build.gradle
index 6f10564..6471c2d 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 group = 'org.apache.cordova'
-version = '6.3.0'
+version = '6.4.0-dev'
 
 android {
     compileSdkVersion cdvCompileSdkVersion
@@ -129,9 +129,9 @@ bintray {
         licenses = ['Apache-2.0']
         labels = ['android', 'cordova', 'phonegap']
         version {
-            name = '6.3.0-dev'
+            name = '6.4.0-dev'
             released  = new Date()
-            vcsTag = '6.3.0-dev'
+            vcsTag = '6.4.0-dev'
         }
     }
 }
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index ec5bcc7..2f79224 100644
--- 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.3.0-dev";
+    public static final String CORDOVA_VERSION = "6.4.0-dev";
 
     void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
 
diff --git a/package.json b/package.json
index 32acea7..f40983f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-android",
-  "version": "6.3.0",
+  "version": "6.4.0-dev",
   "description": "cordova-android release",
   "bin": {
     "create": "bin/create"

-- 
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-android] 04/04: Update JS snapshot to version 6.4.0-dev (via coho)

Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git

commit 7f3be98199c4507db518f780fcf1b20b5bfc3e1c
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Mon Sep 25 11:37:52 2017 -0700

    Update JS snapshot to version 6.4.0-dev (via coho)
---
 bin/templates/project/assets/www/cordova.js | 3871 ++++++++++++++-------------
 1 file changed, 1947 insertions(+), 1924 deletions(-)

diff --git a/bin/templates/project/assets/www/cordova.js b/bin/templates/project/assets/www/cordova.js
index dc1bf5a..e9e79c7 100644
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 7ef9f9c03167a4dde4372d869472241b6816fee9
+// 74a4adc2d0fddb1e0cfb9be1961494ef0afc9893
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -8,9 +8,9 @@
  to you under the Apache License, Version 2.0 (the
  "License"); you may not use this file except in compliance
  with the License.  You may obtain a copy of the License at
-
+ 
      http://www.apache.org/licenses/LICENSE-2.0
-
+ 
  Unless required by applicable law or agreed to in writing,
  software distributed under the License is distributed on an
  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,2168 +18,2191 @@
  specific language governing permissions and limitations
  under the License.
 */
+;(function() {
+var PLATFORM_VERSION_BUILD_LABEL = '6.4.0-dev';
+// file: src/scripts/require.js
+
+/*jshint -W079 */
+/*jshint -W020 */
+
+var require,
+    define;
+
 (function () {
-    var PLATFORM_VERSION_BUILD_LABEL = '6.3.0-dev';
-    // file: src/scripts/require.js
-    /* global prompt */
-    /* global atob */
-    /* eslint no-eval : 0 */
-    /* eslint no-cond-assign : 0 */
-    /* eslint valid-typeof : 0 */
-
-    var require;
-    var define;
-
-    (function () {
-        var modules = {};
-        // Stack of moduleIds currently being built.
-        var requireStack = [];
-        // Map of module ID -> index into requireStack of modules currently being built.
-        var inProgressModules = {};
-        var SEPARATOR = '.';
-
-        function build (module) {
-            var factory = module.factory;
-            var localRequire = function (id) {
+    var modules = {},
+    // Stack of moduleIds currently being built.
+        requireStack = [],
+    // Map of module ID -> index into requireStack of modules currently being built.
+        inProgressModules = {},
+        SEPARATOR = ".";
+
+
+
+    function build(module) {
+        var factory = module.factory,
+            localRequire = function (id) {
                 var resultantId = id;
-                // Its a relative path, so lop off the last portion and add the id (minus "./")
-                if (id.charAt(0) === '.') {
+                //Its a relative path, so lop off the last portion and add the id (minus "./")
+                if (id.charAt(0) === ".") {
                     resultantId = module.id.slice(0, module.id.lastIndexOf(SEPARATOR)) + SEPARATOR + id.slice(2);
                 }
                 return require(resultantId);
             };
-            module.exports = {};
-            delete module.factory;
-            factory(localRequire, module.exports, module);
-            return module.exports;
-        }
+        module.exports = {};
+        delete module.factory;
+        factory(localRequire, module.exports, module);
+        return module.exports;
+    }
 
-        require = function (id) {
-            if (!modules[id]) {
-                throw 'module ' + id + ' not found';
-            } else if (id in inProgressModules) {
-                var cycle = requireStack.slice(inProgressModules[id]).join('->') + '->' + id;
-                throw 'Cycle in require graph: ' + cycle;
-            }
-            if (modules[id].factory) {
-                try {
-                    inProgressModules[id] = requireStack.length;
-                    requireStack.push(id);
-                    return build(modules[id]);
-                } finally {
-                    delete inProgressModules[id];
-                    requireStack.pop();
-                }
+    require = function (id) {
+        if (!modules[id]) {
+            throw "module " + id + " not found";
+        } else if (id in inProgressModules) {
+            var cycle = requireStack.slice(inProgressModules[id]).join('->') + '->' + id;
+            throw "Cycle in require graph: " + cycle;
+        }
+        if (modules[id].factory) {
+            try {
+                inProgressModules[id] = requireStack.length;
+                requireStack.push(id);
+                return build(modules[id]);
+            } finally {
+                delete inProgressModules[id];
+                requireStack.pop();
             }
-            return modules[id].exports;
-        };
+        }
+        return modules[id].exports;
+    };
 
-        define = function (id, factory) {
-            if (modules[id]) {
-                throw 'module ' + id + ' already defined';
-            }
+    define = function (id, factory) {
+        if (modules[id]) {
+            throw "module " + id + " already defined";
+        }
 
-            modules[id] = {
-                id: id,
-                factory: factory
-            };
+        modules[id] = {
+            id: id,
+            factory: factory
         };
+    };
 
-        define.remove = function (id) {
-            delete modules[id];
-        };
+    define.remove = function (id) {
+        delete modules[id];
+    };
 
-        define.moduleMap = modules;
-    })();
+    define.moduleMap = modules;
+})();
 
-    // Export for use in node
-    if (typeof module === 'object' && typeof require === 'function') {
-        module.exports.require = require;
-        module.exports.define = define;
+//Export for use in node
+if (typeof module === "object" && typeof require === "function") {
+    module.exports.require = require;
+    module.exports.define = define;
+}
+
+// file: src/cordova.js
+define("cordova", function(require, exports, module) {
+
+// Workaround for Windows 10 in hosted environment case
+// http://www.w3.org/html/wg/drafts/html/master/browsers.html#named-access-on-the-window-object
+if (window.cordova && !(window.cordova instanceof HTMLElement)) {
+    throw new Error("cordova already defined");
+}
+
+
+var channel = require('cordova/channel');
+var platform = require('cordova/platform');
+
+
+/**
+ * Intercept calls to addEventListener + removeEventListener and handle deviceready,
+ * resume, and pause events.
+ */
+var m_document_addEventListener = document.addEventListener;
+var m_document_removeEventListener = document.removeEventListener;
+var m_window_addEventListener = window.addEventListener;
+var m_window_removeEventListener = window.removeEventListener;
+
+/**
+ * Houses custom event handlers to intercept on document + window event listeners.
+ */
+var documentEventHandlers = {},
+    windowEventHandlers = {};
+
+document.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+    if (typeof documentEventHandlers[e] != 'undefined') {
+        documentEventHandlers[e].subscribe(handler);
+    } else {
+        m_document_addEventListener.call(document, evt, handler, capture);
     }
+};
+
+window.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+    if (typeof windowEventHandlers[e] != 'undefined') {
+        windowEventHandlers[e].subscribe(handler);
+    } else {
+        m_window_addEventListener.call(window, evt, handler, capture);
+    }
+};
+
+document.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+    // If unsubscribing from an event that is handled by a plugin
+    if (typeof documentEventHandlers[e] != "undefined") {
+        documentEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_document_removeEventListener.call(document, evt, handler, capture);
+    }
+};
+
+window.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+    // If unsubscribing from an event that is handled by a plugin
+    if (typeof windowEventHandlers[e] != "undefined") {
+        windowEventHandlers[e].unsubscribe(handler);
+    } else {
+        m_window_removeEventListener.call(window, evt, handler, capture);
+    }
+};
 
-    // file: src/cordova.js
-    define('cordova', function (require, exports, module) {
-
-        // Workaround for Windows 10 in hosted environment case
-        // http://www.w3.org/html/wg/drafts/html/master/browsers.html#named-access-on-the-window-object
-        var HTMLElement;
-        if (window.cordova && !(window.cordova instanceof HTMLElement)) {
-            throw new Error('cordova already defined');
-        }
-
-        var channel = require('cordova/channel');
-        var platform = require('cordova/platform');
-
-        /**
-         * Intercept calls to addEventListener + removeEventListener and handle deviceready,
-         * resume, and pause events.
-         */
-        var m_document_addEventListener = document.addEventListener;
-        var m_document_removeEventListener = document.removeEventListener;
-        var m_window_addEventListener = window.addEventListener;
-        var m_window_removeEventListener = window.removeEventListener;
-
-        /**
-         * Houses custom event handlers to intercept on document + window event listeners.
-         */
-        var documentEventHandlers = {};
-        var windowEventHandlers = {};
-
-        document.addEventListener = function (evt, handler, capture) {
-            var e = evt.toLowerCase();
-            if (typeof documentEventHandlers[e] !== 'undefined') {
-                documentEventHandlers[e].subscribe(handler);
-            } else {
-                m_document_addEventListener.call(document, evt, handler, capture);
-            }
-        };
-
-        window.addEventListener = function (evt, handler, capture) {
-            var e = evt.toLowerCase();
-            if (typeof windowEventHandlers[e] !== 'undefined') {
-                windowEventHandlers[e].subscribe(handler);
-            } else {
-                m_window_addEventListener.call(window, evt, handler, capture);
-            }
-        };
-
-        document.removeEventListener = function (evt, handler, capture) {
-            var e = evt.toLowerCase();
-            // If unsubscribing from an event that is handled by a plugin
-            if (typeof documentEventHandlers[e] !== 'undefined') {
-                documentEventHandlers[e].unsubscribe(handler);
-            } else {
-                m_document_removeEventListener.call(document, evt, handler, capture);
-            }
-        };
-
-        window.removeEventListener = function (evt, handler, capture) {
-            var e = evt.toLowerCase();
-            // If unsubscribing from an event that is handled by a plugin
-            if (typeof windowEventHandlers[e] !== 'undefined') {
-                windowEventHandlers[e].unsubscribe(handler);
-            } else {
-                m_window_removeEventListener.call(window, evt, handler, capture);
+function createEvent(type, data) {
+    var event = document.createEvent('Events');
+    event.initEvent(type, false, false);
+    if (data) {
+        for (var i in data) {
+            if (data.hasOwnProperty(i)) {
+                event[i] = data[i];
             }
-        };
-
-        function createEvent (type, data) {
-            var event = document.createEvent('Events');
-            event.initEvent(type, false, false);
-            if (data) {
-                for (var i in data) {
-                    if (data.hasOwnProperty(i)) {
-                        event[i] = data[i];
+        }
+    }
+    return event;
+}
+
+
+var cordova = {
+    define:define,
+    require:require,
+    version:PLATFORM_VERSION_BUILD_LABEL,
+    platformVersion:PLATFORM_VERSION_BUILD_LABEL,
+    platformId:platform.id,
+    /**
+     * Methods to add/remove your own addEventListener hijacking on document + window.
+     */
+    addWindowEventHandler:function(event) {
+        return (windowEventHandlers[event] = channel.create(event));
+    },
+    addStickyDocumentEventHandler:function(event) {
+        return (documentEventHandlers[event] = channel.createSticky(event));
+    },
+    addDocumentEventHandler:function(event) {
+        return (documentEventHandlers[event] = channel.create(event));
+    },
+    removeWindowEventHandler:function(event) {
+        delete windowEventHandlers[event];
+    },
+    removeDocumentEventHandler:function(event) {
+        delete documentEventHandlers[event];
+    },
+    /**
+     * Retrieve original event handlers that were replaced by Cordova
+     *
+     * @return object
+     */
+    getOriginalHandlers: function() {
+        return {'document': {'addEventListener': m_document_addEventListener, 'removeEventListener': m_document_removeEventListener},
+        'window': {'addEventListener': m_window_addEventListener, 'removeEventListener': m_window_removeEventListener}};
+    },
+    /**
+     * Method to fire event from native code
+     * bNoDetach is required for events which cause an exception which needs to be caught in native code
+     */
+    fireDocumentEvent: function(type, data, bNoDetach) {
+        var evt = createEvent(type, data);
+        if (typeof documentEventHandlers[type] != 'undefined') {
+            if( bNoDetach ) {
+                documentEventHandlers[type].fire(evt);
+            }
+            else {
+                setTimeout(function() {
+                    // Fire deviceready on listeners that were registered before cordova.js was loaded.
+                    if (type == 'deviceready') {
+                        document.dispatchEvent(evt);
                     }
-                }
+                    documentEventHandlers[type].fire(evt);
+                }, 0);
             }
-            return event;
+        } else {
+            document.dispatchEvent(evt);
         }
-
-        var cordova = {
-            define: define,
-            require: require,
-            version: PLATFORM_VERSION_BUILD_LABEL,
-            platformVersion: PLATFORM_VERSION_BUILD_LABEL,
-            platformId: platform.id,
-            /**
-             * Methods to add/remove your own addEventListener hijacking on document + window.
-             */
-            addWindowEventHandler: function (event) {
-                return (windowEventHandlers[event] = channel.create(event));
-            },
-            addStickyDocumentEventHandler: function (event) {
-                return (documentEventHandlers[event] = channel.createSticky(event));
-            },
-            addDocumentEventHandler: function (event) {
-                return (documentEventHandlers[event] = channel.create(event));
-            },
-            removeWindowEventHandler: function (event) {
-                delete windowEventHandlers[event];
-            },
-            removeDocumentEventHandler: function (event) {
-                delete documentEventHandlers[event];
-            },
-            /**
-             * Retrieve original event handlers that were replaced by Cordova
-             *
-             * @return object
-             */
-            getOriginalHandlers: function () {
-                return {'document': {'addEventListener': m_document_addEventListener, 'removeEventListener': m_document_removeEventListener},
-                    'window': {'addEventListener': m_window_addEventListener, 'removeEventListener': m_window_removeEventListener}};
-            },
-            /**
-             * Method to fire event from native code
-             * bNoDetach is required for events which cause an exception which needs to be caught in native code
-             */
-            fireDocumentEvent: function (type, data, bNoDetach) {
-                var evt = createEvent(type, data);
-                if (typeof documentEventHandlers[type] !== 'undefined') {
-                    if (bNoDetach) {
-                        documentEventHandlers[type].fire(evt);
-                    } else {
-                        setTimeout(function () {
-                            // Fire deviceready on listeners that were registered before cordova.js was loaded.
-                            if (type === 'deviceready') {
-                                document.dispatchEvent(evt);
-                            }
-                            documentEventHandlers[type].fire(evt);
-                        }, 0);
-                    }
-                } else {
-                    document.dispatchEvent(evt);
-                }
-            },
-            fireWindowEvent: function (type, data) {
-                var evt = createEvent(type, data);
-                if (typeof windowEventHandlers[type] !== 'undefined') {
-                    setTimeout(function () {
-                        windowEventHandlers[type].fire(evt);
-                    }, 0);
-                } else {
-                    window.dispatchEvent(evt);
+    },
+    fireWindowEvent: function(type, data) {
+        var evt = createEvent(type,data);
+        if (typeof windowEventHandlers[type] != 'undefined') {
+            setTimeout(function() {
+                windowEventHandlers[type].fire(evt);
+            }, 0);
+        } else {
+            window.dispatchEvent(evt);
+        }
+    },
+
+    /**
+     * Plugin callback mechanism.
+     */
+    // Randomize the starting callbackId to avoid collisions after refreshing or navigating.
+    // This way, it's very unlikely that any new callback would get the same callbackId as an old callback.
+    callbackId: Math.floor(Math.random() * 2000000000),
+    callbacks:  {},
+    callbackStatus: {
+        NO_RESULT: 0,
+        OK: 1,
+        CLASS_NOT_FOUND_EXCEPTION: 2,
+        ILLEGAL_ACCESS_EXCEPTION: 3,
+        INSTANTIATION_EXCEPTION: 4,
+        MALFORMED_URL_EXCEPTION: 5,
+        IO_EXCEPTION: 6,
+        INVALID_ACTION: 7,
+        JSON_EXCEPTION: 8,
+        ERROR: 9
+    },
+
+    /**
+     * Called by native code when returning successful result from an action.
+     */
+    callbackSuccess: function(callbackId, args) {
+        cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback);
+    },
+
+    /**
+     * Called by native code when returning error result from an action.
+     */
+    callbackError: function(callbackId, args) {
+        // TODO: Deprecate callbackSuccess and callbackError in favour of callbackFromNative.
+        // Derive success from status.
+        cordova.callbackFromNative(callbackId, false, args.status, [args.message], args.keepCallback);
+    },
+
+    /**
+     * Called by native code when returning the result from an action.
+     */
+    callbackFromNative: function(callbackId, isSuccess, status, args, keepCallback) {
+        try {
+            var callback = cordova.callbacks[callbackId];
+            if (callback) {
+                if (isSuccess && status == cordova.callbackStatus.OK) {
+                    callback.success && callback.success.apply(null, args);
+                } else if (!isSuccess) {
+                    callback.fail && callback.fail.apply(null, args);
                 }
-            },
-
-            /**
-             * Plugin callback mechanism.
-             */
-            // Randomize the starting callbackId to avoid collisions after refreshing or navigating.
-            // This way, it's very unlikely that any new callback would get the same callbackId as an old callback.
-            callbackId: Math.floor(Math.random() * 2000000000),
-            callbacks: {},
-            callbackStatus: {
-                NO_RESULT: 0,
-                OK: 1,
-                CLASS_NOT_FOUND_EXCEPTION: 2,
-                ILLEGAL_ACCESS_EXCEPTION: 3,
-                INSTANTIATION_EXCEPTION: 4,
-                MALFORMED_URL_EXCEPTION: 5,
-                IO_EXCEPTION: 6,
-                INVALID_ACTION: 7,
-                JSON_EXCEPTION: 8,
-                ERROR: 9
-            },
-
-            /**
-             * Called by native code when returning successful result from an action.
-             */
-            callbackSuccess: function (callbackId, args) {
-                cordova.callbackFromNative(callbackId, true, args.status, [args.message], args.keepCallback);
-            },
-
-            /**
-             * Called by native code when returning error result from an action.
-             */
-            callbackError: function (callbackId, args) {
-                // TODO: Deprecate callbackSuccess and callbackError in favour of callbackFromNative.
-                // Derive success from status.
-                cordova.callbackFromNative(callbackId, false, args.status, [args.message], args.keepCallback);
-            },
-
-            /**
-             * Called by native code when returning the result from an action.
-             */
-            callbackFromNative: function (callbackId, isSuccess, status, args, keepCallback) {
-                try {
-                    var callback = cordova.callbacks[callbackId];
-                    if (callback) {
-                        if (isSuccess && status === cordova.callbackStatus.OK) {
-                            callback.success && callback.success.apply(null, args);
-                        } else if (!isSuccess) {
-                            callback.fail && callback.fail.apply(null, args);
-                        }
-                        /*
-                        else
-                            Note, this case is intentionally not caught.
-                            this can happen if isSuccess is true, but callbackStatus is NO_RESULT
-                            which is used to remove a callback from the list without calling the callbacks
-                            typically keepCallback is false in this case
-                        */
-                        // Clear callback if not expecting any more results
-                        if (!keepCallback) {
-                            delete cordova.callbacks[callbackId];
-                        }
-                    }
-                } catch (err) {
-                    var msg = 'Error in ' + (isSuccess ? 'Success' : 'Error') + ' callbackId: ' + callbackId + ' : ' + err;
-                    console && console.log && console.log(msg);
-                    cordova.fireWindowEvent('cordovacallbackerror', { 'message': msg });
-                    throw err;
+                /*
+                else
+                    Note, this case is intentionally not caught.
+                    this can happen if isSuccess is true, but callbackStatus is NO_RESULT
+                    which is used to remove a callback from the list without calling the callbacks
+                    typically keepCallback is false in this case
+                */
+                // Clear callback if not expecting any more results
+                if (!keepCallback) {
+                    delete cordova.callbacks[callbackId];
                 }
-            },
-            addConstructor: function (func) {
-                channel.onCordovaReady.subscribe(function () {
-                    try {
-                        func();
-                    } catch (e) {
-                        console.log('Failed to run constructor: ' + e);
-                    }
-                });
             }
-        };
-
-        module.exports = cordova;
+        }
+        catch (err) {
+            var msg = "Error in " + (isSuccess ? "Success" : "Error") + " callbackId: " + callbackId + " : " + err;
+            console && console.log && console.log(msg);
+            cordova.fireWindowEvent("cordovacallbackerror", { 'message': msg });
+            throw err;
+        }
+    },
+    addConstructor: function(func) {
+        channel.onCordovaReady.subscribe(function() {
+            try {
+                func();
+            } catch(e) {
+                console.log("Failed to run constructor: " + e);
+            }
+        });
+    }
+};
 
-    });
 
-    // file: /Users/maj/src/cordova-android/cordova-js-src/android/nativeapiprovider.js
-    define('cordova/android/nativeapiprovider', function (require, exports, module) {
+module.exports = cordova;
 
-        /**
-         * Exports the ExposedJsApi.java object if available, otherwise exports the PromptBasedNativeApi.
-         */
+});
 
-        var nativeApi = this._cordovaNative || require('cordova/android/promptbasednativeapi');
-        var currentApi = nativeApi;
-
-        module.exports = {
-            get: function () { return currentApi; },
-            setPreferPrompt: function (value) {
-                currentApi = value ? require('cordova/android/promptbasednativeapi') : nativeApi;
-            },
-            // Used only by tests.
-            set: function (value) {
-                currentApi = value;
-            }
-        };
+// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/android/nativeapiprovider.js
+define("cordova/android/nativeapiprovider", function(require, exports, module) {
 
-    });
+/**
+ * Exports the ExposedJsApi.java object if available, otherwise exports the PromptBasedNativeApi.
+ */
 
-    // file: /Users/maj/src/cordova-android/cordova-js-src/android/promptbasednativeapi.js
-    define('cordova/android/promptbasednativeapi', function (require, exports, module) {
+var nativeApi = this._cordovaNative || require('cordova/android/promptbasednativeapi');
+var currentApi = nativeApi;
 
-        /**
-         * Implements the API of ExposedJsApi.java, but uses prompt() to communicate.
-         * This is used pre-JellyBean, where addJavascriptInterface() is disabled.
-         */
+module.exports = {
+    get: function() { return currentApi; },
+    setPreferPrompt: function(value) {
+        currentApi = value ? require('cordova/android/promptbasednativeapi') : nativeApi;
+    },
+    // Used only by tests.
+    set: function(value) {
+        currentApi = value;
+    }
+};
+
+});
+
+// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/android/promptbasednativeapi.js
+define("cordova/android/promptbasednativeapi", function(require, exports, module) {
+
+/**
+ * Implements the API of ExposedJsApi.java, but uses prompt() to communicate.
+ * This is used pre-JellyBean, where addJavascriptInterface() is disabled.
+ */
+
+module.exports = {
+    exec: function(bridgeSecret, service, action, callbackId, argsJson) {
+        return prompt(argsJson, 'gap:'+JSON.stringify([bridgeSecret, service, action, callbackId]));
+    },
+    setNativeToJsBridgeMode: function(bridgeSecret, value) {
+        prompt(value, 'gap_bridge_mode:' + bridgeSecret);
+    },
+    retrieveJsMessages: function(bridgeSecret, fromOnlineEvent) {
+        return prompt(+fromOnlineEvent, 'gap_poll:' + bridgeSecret);
+    }
+};
 
-        module.exports = {
-            exec: function (bridgeSecret, service, action, callbackId, argsJson) {
-                return prompt(argsJson, 'gap:' + JSON.stringify([bridgeSecret, service, action, callbackId]));
-            },
-            setNativeToJsBridgeMode: function (bridgeSecret, value) {
-                prompt(value, 'gap_bridge_mode:' + bridgeSecret);
-            },
-            retrieveJsMessages: function (bridgeSecret, fromOnlineEvent) {
-                return prompt(+fromOnlineEvent, 'gap_poll:' + bridgeSecret);
-            }
-        };
+});
 
-    });
+// file: src/common/argscheck.js
+define("cordova/argscheck", function(require, exports, module) {
 
-    // file: src/common/argscheck.js
-    define('cordova/argscheck', function (require, exports, module) {
+var utils = require('cordova/utils');
 
-        var utils = require('cordova/utils');
+var moduleExports = module.exports;
 
-        var moduleExports = module.exports;
+var typeMap = {
+    'A': 'Array',
+    'D': 'Date',
+    'N': 'Number',
+    'S': 'String',
+    'F': 'Function',
+    'O': 'Object'
+};
 
-        var typeMap = {
-            'A': 'Array',
-            'D': 'Date',
-            'N': 'Number',
-            'S': 'String',
-            'F': 'Function',
-            'O': 'Object'
-        };
+function extractParamName(callee, argIndex) {
+    return (/.*?\((.*?)\)/).exec(callee)[1].split(', ')[argIndex];
+}
 
-        function extractParamName (callee, argIndex) {
-            return (/.*?\((.*?)\)/).exec(callee)[1].split(', ')[argIndex];
+function checkArgs(spec, functionName, args, opt_callee) {
+    if (!moduleExports.enableChecks) {
+        return;
+    }
+    var errMsg = null;
+    var typeName;
+    for (var i = 0; i < spec.length; ++i) {
+        var c = spec.charAt(i),
+            cUpper = c.toUpperCase(),
+            arg = args[i];
+        // Asterix means allow anything.
+        if (c == '*') {
+            continue;
         }
-
-        function checkArgs (spec, functionName, args, opt_callee) {
-            if (!moduleExports.enableChecks) {
-                return;
-            }
-            var errMsg = null;
-            var typeName;
-            for (var i = 0; i < spec.length; ++i) {
-                var c = spec.charAt(i);
-                var cUpper = c.toUpperCase();
-                var arg = args[i];
-                // Asterix means allow anything.
-                if (c === '*') {
-                    continue;
-                }
-                typeName = utils.typeName(arg);
-                if ((arg === null || arg === undefined) && c === cUpper) {
-                    continue;
-                }
-                if (typeName !== typeMap[cUpper]) {
-                    errMsg = 'Expected ' + typeMap[cUpper];
-                    break;
-                }
-            }
-            if (errMsg) {
-                errMsg += ', but got ' + typeName + '.';
-                errMsg = 'Wrong type for parameter "' + extractParamName(opt_callee || args.callee, i) + '" of ' + functionName + ': ' + errMsg;
-                // Don't log when running unit tests.
-                if (typeof jasmine === 'undefined') {
-                    console.error(errMsg);
-                }
-                throw TypeError(errMsg);
-            }
+        typeName = utils.typeName(arg);
+        if ((arg === null || arg === undefined) && c == cUpper) {
+            continue;
         }
-
-        function getValue (value, defaultValue) {
-            return value === undefined ? defaultValue : value;
+        if (typeName != typeMap[cUpper]) {
+            errMsg = 'Expected ' + typeMap[cUpper];
+            break;
         }
+    }
+    if (errMsg) {
+        errMsg += ', but got ' + typeName + '.';
+        errMsg = 'Wrong type for parameter "' + extractParamName(opt_callee || args.callee, i) + '" of ' + functionName + ': ' + errMsg;
+        // Don't log when running unit tests.
+        if (typeof jasmine == 'undefined') {
+            console.error(errMsg);
+        }
+        throw TypeError(errMsg);
+    }
+}
 
-        moduleExports.checkArgs = checkArgs;
-        moduleExports.getValue = getValue;
-        moduleExports.enableChecks = true;
-
-    });
-
-    // file: src/common/base64.js
-    define('cordova/base64', function (require, exports, module) {
-
-        var base64 = exports;
+function getValue(value, defaultValue) {
+    return value === undefined ? defaultValue : value;
+}
 
-        base64.fromArrayBuffer = function (arrayBuffer) {
-            var array = new Uint8Array(arrayBuffer);
-            return uint8ToBase64(array);
-        };
+moduleExports.checkArgs = checkArgs;
+moduleExports.getValue = getValue;
+moduleExports.enableChecks = true;
 
-        base64.toArrayBuffer = function (str) {
-            var decodedStr = typeof atob !== 'undefined' ? atob(str) : Buffer.alloc(str, 'base64').toString('binary');
-            var arrayBuffer = new ArrayBuffer(decodedStr.length);
-            var array = new Uint8Array(arrayBuffer);
-            for (var i = 0, len = decodedStr.length; i < len; i++) {
-                array[i] = decodedStr.charCodeAt(i);
-            }
-            return arrayBuffer;
-        };
 
-        // ------------------------------------------------------------------------------
+});
 
-        /* This code is based on the performance tests at http://jsperf.com/b64tests
-         * This 12-bit-at-a-time algorithm was the best performing version on all
-         * platforms tested.
-         */
+// file: src/common/base64.js
+define("cordova/base64", function(require, exports, module) {
 
-        var b64_6bit = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-        var b64_12bit;
+var base64 = exports;
 
-        var b64_12bitTable = function () {
-            b64_12bit = [];
-            for (var i = 0; i < 64; i++) {
-                for (var j = 0; j < 64; j++) {
-                    b64_12bit[i * 64 + j] = b64_6bit[i] + b64_6bit[j];
-                }
-            }
-            b64_12bitTable = function () { return b64_12bit; };
-            return b64_12bit;
-        };
+base64.fromArrayBuffer = function(arrayBuffer) {
+    var array = new Uint8Array(arrayBuffer);
+    return uint8ToBase64(array);
+};
 
-        function uint8ToBase64 (rawData) {
-            var numBytes = rawData.byteLength;
-            var output = '';
-            var segment;
-            var table = b64_12bitTable();
-            for (var i = 0; i < numBytes - 2; i += 3) {
-                segment = (rawData[i] << 16) + (rawData[i + 1] << 8) + rawData[i + 2];
-                output += table[segment >> 12];
-                output += table[segment & 0xfff];
-            }
-            if (numBytes - i === 2) {
-                segment = (rawData[i] << 16) + (rawData[i + 1] << 8);
-                output += table[segment >> 12];
-                output += b64_6bit[(segment & 0xfff) >> 6];
-                output += '=';
-            } else if (numBytes - i === 1) {
-                segment = (rawData[i] << 16);
-                output += table[segment >> 12];
-                output += '==';
-            }
-            return output;
-        }
+base64.toArrayBuffer = function(str) {
+    var decodedStr = typeof atob != 'undefined' ? atob(str) : new Buffer(str,'base64').toString('binary');
+    var arrayBuffer = new ArrayBuffer(decodedStr.length);
+    var array = new Uint8Array(arrayBuffer);
+    for (var i=0, len=decodedStr.length; i < len; i++) {
+        array[i] = decodedStr.charCodeAt(i);
+    }
+    return arrayBuffer;
+};
 
-    });
+//------------------------------------------------------------------------------
 
-    // file: src/common/builder.js
-    define('cordova/builder', function (require, exports, module) {
+/* This code is based on the performance tests at http://jsperf.com/b64tests
+ * This 12-bit-at-a-time algorithm was the best performing version on all
+ * platforms tested.
+ */
 
-        var utils = require('cordova/utils');
+var b64_6bit = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+var b64_12bit;
 
-        function each (objects, func, context) {
-            for (var prop in objects) {
-                if (objects.hasOwnProperty(prop)) {
-                    func.apply(context, [objects[prop], prop]);
-                }
-            }
+var b64_12bitTable = function() {
+    b64_12bit = [];
+    for (var i=0; i<64; i++) {
+        for (var j=0; j<64; j++) {
+            b64_12bit[i*64+j] = b64_6bit[i] + b64_6bit[j];
         }
+    }
+    b64_12bitTable = function() { return b64_12bit; };
+    return b64_12bit;
+};
+
+function uint8ToBase64(rawData) {
+    var numBytes = rawData.byteLength;
+    var output="";
+    var segment;
+    var table = b64_12bitTable();
+    for (var i=0;i<numBytes-2;i+=3) {
+        segment = (rawData[i] << 16) + (rawData[i+1] << 8) + rawData[i+2];
+        output += table[segment >> 12];
+        output += table[segment & 0xfff];
+    }
+    if (numBytes - i == 2) {
+        segment = (rawData[i] << 16) + (rawData[i+1] << 8);
+        output += table[segment >> 12];
+        output += b64_6bit[(segment & 0xfff) >> 6];
+        output += '=';
+    } else if (numBytes - i == 1) {
+        segment = (rawData[i] << 16);
+        output += table[segment >> 12];
+        output += '==';
+    }
+    return output;
+}
 
-        function clobber (obj, key, value) {
-            exports.replaceHookForTesting(obj, key);
-            var needsProperty = false;
-            try {
-                obj[key] = value;
-            } catch (e) {
-                needsProperty = true;
-            }
-            // Getters can only be overridden by getters.
-            if (needsProperty || obj[key] !== value) {
-                utils.defineGetter(obj, key, function () {
-                    return value;
-                });
-            }
-        }
+});
 
-        function assignOrWrapInDeprecateGetter (obj, key, value, message) {
-            if (message) {
-                utils.defineGetter(obj, key, function () {
-                    console.log(message);
-                    delete obj[key];
-                    clobber(obj, key, value);
-                    return value;
-                });
-            } else {
-                clobber(obj, key, value);
-            }
-        }
+// file: src/common/builder.js
+define("cordova/builder", function(require, exports, module) {
 
-        function include (parent, objects, clobber, merge) {
-            each(objects, function (obj, key) {
-                try {
-                    var result = obj.path ? require(obj.path) : {};
-
-                    if (clobber) {
-                        // Clobber if it doesn't exist.
-                        if (typeof parent[key] === 'undefined') {
-                            assignOrWrapInDeprecateGetter(parent, key, result, obj.deprecated);
-                        } else if (typeof obj.path !== 'undefined') {
-                            // If merging, merge properties onto parent, otherwise, clobber.
-                            if (merge) {
-                                recursiveMerge(parent[key], result);
-                            } else {
-                                assignOrWrapInDeprecateGetter(parent, key, result, obj.deprecated);
-                            }
-                        }
-                        result = parent[key];
-                    } else {
-                        // Overwrite if not currently defined.
-                        if (typeof parent[key] === 'undefined') {
-                            assignOrWrapInDeprecateGetter(parent, key, result, obj.deprecated);
-                        } else {
-                            // Set result to what already exists, so we can build children into it if they exist.
-                            result = parent[key];
-                        }
-                    }
+var utils = require('cordova/utils');
 
-                    if (obj.children) {
-                        include(result, obj.children, clobber, merge);
-                    }
-                } catch (e) {
-                    utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"');
-                }
-            });
+function each(objects, func, context) {
+    for (var prop in objects) {
+        if (objects.hasOwnProperty(prop)) {
+            func.apply(context, [objects[prop], prop]);
         }
-
-        /**
-         * Merge properties from one object onto another recursively.  Properties from
-         * the src object will overwrite existing target property.
-         *
-         * @param target Object to merge properties into.
-         * @param src Object to merge properties from.
-         */
-        function recursiveMerge (target, src) {
-            for (var prop in src) {
-                if (src.hasOwnProperty(prop)) {
-                    if (target.prototype && target.prototype.constructor === target) {
-                        // If the target object is a constructor override off prototype.
-                        clobber(target.prototype, prop, src[prop]);
+    }
+}
+
+function clobber(obj, key, value) {
+    exports.replaceHookForTesting(obj, key);
+    var needsProperty = false;
+    try {
+        obj[key] = value;
+    } catch (e) {
+        needsProperty = true;
+    }
+    // Getters can only be overridden by getters.
+    if (needsProperty || obj[key] !== value) {
+        utils.defineGetter(obj, key, function() {
+            return value;
+        });
+    }
+}
+
+function assignOrWrapInDeprecateGetter(obj, key, value, message) {
+    if (message) {
+        utils.defineGetter(obj, key, function() {
+            console.log(message);
+            delete obj[key];
+            clobber(obj, key, value);
+            return value;
+        });
+    } else {
+        clobber(obj, key, value);
+    }
+}
+
+function include(parent, objects, clobber, merge) {
+    each(objects, function (obj, key) {
+        try {
+            var result = obj.path ? require(obj.path) : {};
+
+            if (clobber) {
+                // Clobber if it doesn't exist.
+                if (typeof parent[key] === 'undefined') {
+                    assignOrWrapInDeprecateGetter(parent, key, result, obj.deprecated);
+                } else if (typeof obj.path !== 'undefined') {
+                    // If merging, merge properties onto parent, otherwise, clobber.
+                    if (merge) {
+                        recursiveMerge(parent[key], result);
                     } else {
-                        if (typeof src[prop] === 'object' && typeof target[prop] === 'object') {
-                            recursiveMerge(target[prop], src[prop]);
-                        } else {
-                            clobber(target, prop, src[prop]);
-                        }
-                    }
-                }
-            }
-        }
-
-        exports.buildIntoButDoNotClobber = function (objects, target) {
-            include(target, objects, false, false);
-        };
-        exports.buildIntoAndClobber = function (objects, target) {
-            include(target, objects, true, false);
-        };
-        exports.buildIntoAndMerge = function (objects, target) {
-            include(target, objects, true, true);
-        };
-        exports.recursiveMerge = recursiveMerge;
-        exports.assignOrWrapInDeprecateGetter = assignOrWrapInDeprecateGetter;
-        exports.replaceHookForTesting = function () {};
-
-    });
-
-    // file: src/common/channel.js
-    define('cordova/channel', function (require, exports, module) {
-
-        var utils = require('cordova/utils');
-        var nextGuid = 1;
-
-        /**
-         * Custom pub-sub "channel" that can have functions subscribed to it
-         * This object is used to define and control firing of events for
-         * cordova initialization, as well as for custom events thereafter.
-         *
-         * The order of events during page load and Cordova startup is as follows:
-         *
-         * onDOMContentLoaded*         Internal event that is received when the web page is loaded and parsed.
-         * onNativeReady*              Internal event that indicates the Cordova native side is ready.
-         * onCordovaReady*             Internal event fired when all Cordova JavaScript objects have been created.
-         * onDeviceReady*              User event fired to indicate that Cordova is ready
-         * onResume                    User event fired to indicate a start/resume lifecycle event
-         * onPause                     User event fired to indicate a pause lifecycle event
-         *
-         * The events marked with an * are sticky. Once they have fired, they will stay in the fired state.
-         * All listeners that subscribe after the event is fired will be executed right away.
-         *
-         * The only Cordova events that user code should register for are:
-         *      deviceready           Cordova native code is initialized and Cordova APIs can be called from JavaScript
-         *      pause                 App has moved to background
-         *      resume                App has returned to foreground
-         *
-         * Listeners can be registered as:
-         *      document.addEventListener("deviceready", myDeviceReadyListener, false);
-         *      document.addEventListener("resume", myResumeListener, false);
-         *      document.addEventListener("pause", myPauseListener, false);
-         *
-         * The DOM lifecycle events should be used for saving and restoring state
-         *      window.onload
-         *      window.onunload
-         *
-         */
-
-        /**
-         * Channel
-         * @constructor
-         * @param type  String the channel name
-         */
-        var Channel = function (type, sticky) {
-            this.type = type;
-            // Map of guid -> function.
-            this.handlers = {};
-            // 0 = Non-sticky, 1 = Sticky non-fired, 2 = Sticky fired.
-            this.state = sticky ? 1 : 0;
-            // Used in sticky mode to remember args passed to fire().
-            this.fireArgs = null;
-            // Used by onHasSubscribersChange to know if there are any listeners.
-            this.numHandlers = 0;
-            // Function that is called when the first listener is subscribed, or when
-            // the last listener is unsubscribed.
-            this.onHasSubscribersChange = null;
-        };
-        var channel = {
-            /**
-             * Calls the provided function only after all of the channels specified
-             * have been fired. All channels must be sticky channels.
-             */
-            join: function (h, c) {
-                var len = c.length;
-                var i = len;
-                var f = function () {
-                    if (!(--i)) h();
-                };
-                for (var j = 0; j < len; j++) {
-                    if (c[j].state === 0) {
-                        throw Error('Can only use join with sticky channels.');
+                        assignOrWrapInDeprecateGetter(parent, key, result, obj.deprecated);
                     }
-                    c[j].subscribe(f);
                 }
-                if (!len) h();
-            },
-            create: function (type) {
-                return (channel[type] = new Channel(type, false));
-            },
-            createSticky: function (type) {
-                return (channel[type] = new Channel(type, true));
-            },
-
-            /**
-             * cordova Channels that must fire before "deviceready" is fired.
-             */
-            deviceReadyChannelsArray: [],
-            deviceReadyChannelsMap: {},
-
-            /**
-             * Indicate that a feature needs to be initialized before it is ready to be used.
-             * This holds up Cordova's "deviceready" event until the feature has been initialized
-             * and Cordova.initComplete(feature) is called.
-             *
-             * @param feature {String}     The unique feature name
-             */
-            waitForInitialization: function (feature) {
-                if (feature) {
-                    var c = channel[feature] || this.createSticky(feature);
-                    this.deviceReadyChannelsMap[feature] = c;
-                    this.deviceReadyChannelsArray.push(c);
-                }
-            },
-
-            /**
-             * Indicate that initialization code has completed and the feature is ready to be used.
-             *
-             * @param feature {String}     The unique feature name
-             */
-            initializationComplete: function (feature) {
-                var c = this.deviceReadyChannelsMap[feature];
-                if (c) {
-                    c.fire();
+                result = parent[key];
+            } else {
+                // Overwrite if not currently defined.
+                if (typeof parent[key] == 'undefined') {
+                    assignOrWrapInDeprecateGetter(parent, key, result, obj.deprecated);
+                } else {
+                    // Set result to what already exists, so we can build children into it if they exist.
+                    result = parent[key];
                 }
             }
-        };
 
-        function checkSubscriptionArgument (argument) {
-            if (typeof argument !== 'function' && typeof argument.handleEvent !== 'function') {
-                throw new Error(
-                    'Must provide a function or an EventListener object ' +
-                'implementing the handleEvent interface.'
-                );
+            if (obj.children) {
+                include(result, obj.children, clobber, merge);
             }
+        } catch(e) {
+            utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"');
         }
-
-        /**
-         * Subscribes the given function to the channel. Any time that
-         * Channel.fire is called so too will the function.
-         * Optionally specify an execution context for the function
-         * and a guid that can be used to stop subscribing to the channel.
-         * Returns the guid.
-         */
-        Channel.prototype.subscribe = function (eventListenerOrFunction, eventListener) {
-            checkSubscriptionArgument(eventListenerOrFunction);
-            var handleEvent, guid;
-
-            if (eventListenerOrFunction && typeof eventListenerOrFunction === 'object') {
-                // Received an EventListener object implementing the handleEvent interface
-                handleEvent = eventListenerOrFunction.handleEvent;
-                eventListener = eventListenerOrFunction;
+    });
+}
+
+/**
+ * Merge properties from one object onto another recursively.  Properties from
+ * the src object will overwrite existing target property.
+ *
+ * @param target Object to merge properties into.
+ * @param src Object to merge properties from.
+ */
+function recursiveMerge(target, src) {
+    for (var prop in src) {
+        if (src.hasOwnProperty(prop)) {
+            if (target.prototype && target.prototype.constructor === target) {
+                // If the target object is a constructor override off prototype.
+                clobber(target.prototype, prop, src[prop]);
             } else {
-                // Received a function to handle event
-                handleEvent = eventListenerOrFunction;
-            }
-
-            if (this.state === 2) {
-                handleEvent.apply(eventListener || this, this.fireArgs);
-                return;
-            }
-
-            guid = eventListenerOrFunction.observer_guid;
-            if (typeof eventListener === 'object') {
-                handleEvent = utils.close(eventListener, handleEvent);
-            }
-
-            if (!guid) {
-                // First time any channel has seen this subscriber
-                guid = '' + nextGuid++;
-            }
-            handleEvent.observer_guid = guid;
-            eventListenerOrFunction.observer_guid = guid;
-
-            // Don't add the same handler more than once.
-            if (!this.handlers[guid]) {
-                this.handlers[guid] = handleEvent;
-                this.numHandlers++;
-                if (this.numHandlers === 1) {
-                    this.onHasSubscribersChange && this.onHasSubscribersChange();
+                if (typeof src[prop] === 'object' && typeof target[prop] === 'object') {
+                    recursiveMerge(target[prop], src[prop]);
+                } else {
+                    clobber(target, prop, src[prop]);
                 }
             }
-        };
-
+        }
+    }
+}
+
+exports.buildIntoButDoNotClobber = function(objects, target) {
+    include(target, objects, false, false);
+};
+exports.buildIntoAndClobber = function(objects, target) {
+    include(target, objects, true, false);
+};
+exports.buildIntoAndMerge = function(objects, target) {
+    include(target, objects, true, true);
+};
+exports.recursiveMerge = recursiveMerge;
+exports.assignOrWrapInDeprecateGetter = assignOrWrapInDeprecateGetter;
+exports.replaceHookForTesting = function() {};
+
+});
+
+// file: src/common/channel.js
+define("cordova/channel", function(require, exports, module) {
+
+var utils = require('cordova/utils'),
+    nextGuid = 1;
+
+/**
+ * Custom pub-sub "channel" that can have functions subscribed to it
+ * This object is used to define and control firing of events for
+ * cordova initialization, as well as for custom events thereafter.
+ *
+ * The order of events during page load and Cordova startup is as follows:
+ *
+ * onDOMContentLoaded*         Internal event that is received when the web page is loaded and parsed.
+ * onNativeReady*              Internal event that indicates the Cordova native side is ready.
+ * onCordovaReady*             Internal event fired when all Cordova JavaScript objects have been created.
+ * onDeviceReady*              User event fired to indicate that Cordova is ready
+ * onResume                    User event fired to indicate a start/resume lifecycle event
+ * onPause                     User event fired to indicate a pause lifecycle event
+ *
+ * The events marked with an * are sticky. Once they have fired, they will stay in the fired state.
+ * All listeners that subscribe after the event is fired will be executed right away.
+ *
+ * The only Cordova events that user code should register for are:
+ *      deviceready           Cordova native code is initialized and Cordova APIs can be called from JavaScript
+ *      pause                 App has moved to background
+ *      resume                App has returned to foreground
+ *
+ * Listeners can be registered as:
+ *      document.addEventListener("deviceready", myDeviceReadyListener, false);
+ *      document.addEventListener("resume", myResumeListener, false);
+ *      document.addEventListener("pause", myPauseListener, false);
+ *
+ * The DOM lifecycle events should be used for saving and restoring state
+ *      window.onload
+ *      window.onunload
+ *
+ */
+
+/**
+ * Channel
+ * @constructor
+ * @param type  String the channel name
+ */
+var Channel = function(type, sticky) {
+    this.type = type;
+    // Map of guid -> function.
+    this.handlers = {};
+    // 0 = Non-sticky, 1 = Sticky non-fired, 2 = Sticky fired.
+    this.state = sticky ? 1 : 0;
+    // Used in sticky mode to remember args passed to fire().
+    this.fireArgs = null;
+    // Used by onHasSubscribersChange to know if there are any listeners.
+    this.numHandlers = 0;
+    // Function that is called when the first listener is subscribed, or when
+    // the last listener is unsubscribed.
+    this.onHasSubscribersChange = null;
+},
+    channel = {
         /**
-         * Unsubscribes the function with the given guid from the channel.
+         * Calls the provided function only after all of the channels specified
+         * have been fired. All channels must be sticky channels.
          */
-        Channel.prototype.unsubscribe = function (eventListenerOrFunction) {
-            checkSubscriptionArgument(eventListenerOrFunction);
-            var handleEvent, guid, handler;
-
-            if (eventListenerOrFunction && typeof eventListenerOrFunction === 'object') {
-                // Received an EventListener object implementing the handleEvent interface
-                handleEvent = eventListenerOrFunction.handleEvent;
-            } else {
-                // Received a function to handle event
-                handleEvent = eventListenerOrFunction;
-            }
-
-            guid = handleEvent.observer_guid;
-            handler = this.handlers[guid];
-            if (handler) {
-                delete this.handlers[guid];
-                this.numHandlers--;
-                if (this.numHandlers === 0) {
-                    this.onHasSubscribersChange && this.onHasSubscribersChange();
+        join: function(h, c) {
+            var len = c.length,
+                i = len,
+                f = function() {
+                    if (!(--i)) h();
+                };
+            for (var j=0; j<len; j++) {
+                if (c[j].state === 0) {
+                    throw Error('Can only use join with sticky channels.');
                 }
+                c[j].subscribe(f);
             }
-        };
+            if (!len) h();
+        },
+        create: function(type) {
+            return channel[type] = new Channel(type, false);
+        },
+        createSticky: function(type) {
+            return channel[type] = new Channel(type, true);
+        },
 
         /**
-         * Calls all functions subscribed to this channel.
+         * cordova Channels that must fire before "deviceready" is fired.
          */
-        Channel.prototype.fire = function (e) {
-            var fireArgs = Array.prototype.slice.call(arguments);
-            // Apply stickiness.
-            if (this.state === 1) {
-                this.state = 2;
-                this.fireArgs = fireArgs;
-            }
-            if (this.numHandlers) {
-                // Copy the values first so that it is safe to modify it from within
-                // callbacks.
-                var toCall = [];
-                for (var item in this.handlers) {
-                    toCall.push(this.handlers[item]);
-                }
-                for (var i = 0; i < toCall.length; ++i) {
-                    toCall[i].apply(this, fireArgs);
-                }
-                if (this.state === 2 && this.numHandlers) {
-                    this.numHandlers = 0;
-                    this.handlers = {};
-                    this.onHasSubscribersChange && this.onHasSubscribersChange();
-                }
-            }
-        };
-
-        // defining them here so they are ready super fast!
-        // DOM event that is received when the web page is loaded and parsed.
-        channel.createSticky('onDOMContentLoaded');
-
-        // Event to indicate the Cordova native side is ready.
-        channel.createSticky('onNativeReady');
-
-        // Event to indicate that all Cordova JavaScript objects have been created
-        // and it's time to run plugin constructors.
-        channel.createSticky('onCordovaReady');
-
-        // Event to indicate that all automatically loaded JS plugins are loaded and ready.
-        // FIXME remove this
-        channel.createSticky('onPluginsReady');
-
-        // Event to indicate that Cordova is ready
-        channel.createSticky('onDeviceReady');
-
-        // Event to indicate a resume lifecycle event
-        channel.create('onResume');
-
-        // Event to indicate a pause lifecycle event
-        channel.create('onPause');
-
-        // Channels that must fire before "deviceready" is fired.
-        channel.waitForInitialization('onCordovaReady');
-        channel.waitForInitialization('onDOMContentLoaded');
-
-        module.exports = channel;
-
-    });
-
-    // file: /Users/maj/src/cordova-android/cordova-js-src/exec.js
-    define('cordova/exec', function (require, exports, module) {
+        deviceReadyChannelsArray: [],
+        deviceReadyChannelsMap: {},
 
         /**
-         * Execute a cordova command.  It is up to the native side whether this action
-         * is synchronous or asynchronous.  The native side can return:
-         *      Synchronous: PluginResult object as a JSON string
-         *      Asynchronous: Empty string ""
-         * If async, the native side will cordova.callbackSuccess or cordova.callbackError,
-         * depending upon the result of the action.
+         * Indicate that a feature needs to be initialized before it is ready to be used.
+         * This holds up Cordova's "deviceready" event until the feature has been initialized
+         * and Cordova.initComplete(feature) is called.
          *
-         * @param {Function} success    The success callback
-         * @param {Function} fail       The fail callback
-         * @param {String} service      The name of the service to use
-         * @param {String} action       Action to be run in cordova
-         * @param {String[]} [args]     Zero or more arguments to pass to the method
+         * @param feature {String}     The unique feature name
          */
-        var cordova = require('cordova');
-        var nativeApiProvider = require('cordova/android/nativeapiprovider');
-        var utils = require('cordova/utils');
-        var base64 = require('cordova/base64');
-        var channel = require('cordova/channel');
-        var jsToNativeModes = {
-            PROMPT: 0,
-            JS_OBJECT: 1
-        };
-        var nativeToJsModes = {
-            // Polls for messages using the JS->Native bridge.
-            POLLING: 0,
-            // For LOAD_URL to be viable, it would need to have a work-around for
-            // the bug where the soft-keyboard gets dismissed when a message is sent.
-            LOAD_URL: 1,
-            // For the ONLINE_EVENT to be viable, it would need to intercept all event
-            // listeners (both through addEventListener and window.ononline) as well
-            // as set the navigator property itself.
-            ONLINE_EVENT: 2,
-            EVAL_BRIDGE: 3
-        };
-        var jsToNativeBridgeMode; // Set lazily.
-        var nativeToJsBridgeMode = nativeToJsModes.EVAL_BRIDGE;
-        var pollEnabled = false;
-        var bridgeSecret = -1;
-
-        var messagesFromNative = [];
-        var isProcessing = false;
-        var resolvedPromise = typeof Promise === 'undefined' ? null : Promise.resolve();
-        var nextTick = resolvedPromise ? function (fn) { resolvedPromise.then(fn); } : function (fn) { setTimeout(fn); };
-
-        function androidExec (success, fail, service, action, args) {
-            if (bridgeSecret < 0) {
-                // If we ever catch this firing, we'll need to queue up exec()s
-                // and fire them once we get a secret. For now, I don't think
-                // it's possible for exec() to be called since plugins are parsed but
-                // not run until until after onNativeReady.
-                throw new Error('exec() called without bridgeSecret');
-            }
-            // Set default bridge modes if they have not already been set.
-            // By default, we use the failsafe, since addJavascriptInterface breaks too often
-            if (jsToNativeBridgeMode === undefined) {
-                androidExec.setJsToNativeBridgeMode(jsToNativeModes.JS_OBJECT);
-            }
-
-            // If args is not provided, default to an empty array
-            args = args || [];
-
-            // Process any ArrayBuffers in the args into a string.
-            for (var i = 0; i < args.length; i++) {
-                if (utils.typeName(args[i]) === 'ArrayBuffer') {
-                    args[i] = base64.fromArrayBuffer(args[i]);
-                }
-            }
-
-            var callbackId = service + cordova.callbackId++;
-            var argsJson = JSON.stringify(args);
-            if (success || fail) {
-                cordova.callbacks[callbackId] = {success: success, fail: fail};
+        waitForInitialization: function(feature) {
+            if (feature) {
+                var c = channel[feature] || this.createSticky(feature);
+                this.deviceReadyChannelsMap[feature] = c;
+                this.deviceReadyChannelsArray.push(c);
             }
+        },
 
-            var msgs = nativeApiProvider.get().exec(bridgeSecret, service, action, callbackId, argsJson);
-            // If argsJson was received by Java as null, try again with the PROMPT bridge mode.
-            // This happens in rare circumstances, such as when certain Unicode characters are passed over the bridge on a Galaxy S2.  See CB-2666.
-            if (jsToNativeBridgeMode === jsToNativeModes.JS_OBJECT && msgs === '@Null arguments.') {
-                androidExec.setJsToNativeBridgeMode(jsToNativeModes.PROMPT);
-                androidExec(success, fail, service, action, args);
-                androidExec.setJsToNativeBridgeMode(jsToNativeModes.JS_OBJECT);
-            } else if (msgs) {
-                messagesFromNative.push(msgs);
-                // Always process async to avoid exceptions messing up stack.
-                nextTick(processMessages);
+        /**
+         * Indicate that initialization code has completed and the feature is ready to be used.
+         *
+         * @param feature {String}     The unique feature name
+         */
+        initializationComplete: function(feature) {
+            var c = this.deviceReadyChannelsMap[feature];
+            if (c) {
+                c.fire();
             }
         }
+    };
+
+function checkSubscriptionArgument(argument) {
+    if (typeof argument !== "function" && typeof argument.handleEvent !== "function") {
+        throw new Error(
+                "Must provide a function or an EventListener object " +
+                "implementing the handleEvent interface."
+        );
+    }
+}
+
+/**
+ * Subscribes the given function to the channel. Any time that
+ * Channel.fire is called so too will the function.
+ * Optionally specify an execution context for the function
+ * and a guid that can be used to stop subscribing to the channel.
+ * Returns the guid.
+ */
+Channel.prototype.subscribe = function(eventListenerOrFunction, eventListener) {
+    checkSubscriptionArgument(eventListenerOrFunction);
+    var handleEvent, guid;
+
+    if (eventListenerOrFunction && typeof eventListenerOrFunction === "object") {
+        // Received an EventListener object implementing the handleEvent interface
+        handleEvent = eventListenerOrFunction.handleEvent;
+        eventListener = eventListenerOrFunction;
+    } else {
+        // Received a function to handle event
+        handleEvent = eventListenerOrFunction;
+    }
 
-        androidExec.init = function () {
-            // CB-11828
-            // This failsafe checks the version of Android and if it's Jellybean, it switches it to
-            // using the Online Event bridge for communicating from Native to JS
-            //
-            // It's ugly, but it's necessary.
-            var check = navigator.userAgent.toLowerCase().match(/android\s[0-9].[0-9]/);
-            var version_code = check && check[0].match(/4.[0-3].*/);
-            if (version_code !== null && nativeToJsBridgeMode === nativeToJsModes.EVAL_BRIDGE) {
-                nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT;
-            }
-
-            bridgeSecret = +prompt('', 'gap_init:' + nativeToJsBridgeMode);
-            channel.onNativeReady.fire();
-        };
-
-        function pollOnceFromOnlineEvent () {
-            pollOnce(true);
-        }
+    if (this.state == 2) {
+        handleEvent.apply(eventListener || this, this.fireArgs);
+        return;
+    }
 
-        function pollOnce (opt_fromOnlineEvent) {
-            if (bridgeSecret < 0) {
-                // This can happen when the NativeToJsMessageQueue resets the online state on page transitions.
-                // We know there's nothing to retrieve, so no need to poll.
-                return;
-            }
-            var msgs = nativeApiProvider.get().retrieveJsMessages(bridgeSecret, !!opt_fromOnlineEvent);
-            if (msgs) {
-                messagesFromNative.push(msgs);
-                // Process sync since we know we're already top-of-stack.
-                processMessages();
-            }
-        }
+    guid = eventListenerOrFunction.observer_guid;
+    if (typeof eventListener === "object") {
+        handleEvent = utils.close(eventListener, handleEvent);
+    }
 
-        function pollingTimerFunc () {
-            if (pollEnabled) {
-                pollOnce();
-                setTimeout(pollingTimerFunc, 50);
-            }
+    if (!guid) {
+        // First time any channel has seen this subscriber
+        guid = '' + nextGuid++;
+    }
+    handleEvent.observer_guid = guid;
+    eventListenerOrFunction.observer_guid = guid;
+
+    // Don't add the same handler more than once.
+    if (!this.handlers[guid]) {
+        this.handlers[guid] = handleEvent;
+        this.numHandlers++;
+        if (this.numHandlers == 1) {
+            this.onHasSubscribersChange && this.onHasSubscribersChange();
         }
+    }
+};
+
+/**
+ * Unsubscribes the function with the given guid from the channel.
+ */
+Channel.prototype.unsubscribe = function(eventListenerOrFunction) {
+    checkSubscriptionArgument(eventListenerOrFunction);
+    var handleEvent, guid, handler;
+
+    if (eventListenerOrFunction && typeof eventListenerOrFunction === "object") {
+        // Received an EventListener object implementing the handleEvent interface
+        handleEvent = eventListenerOrFunction.handleEvent;
+    } else {
+        // Received a function to handle event
+        handleEvent = eventListenerOrFunction;
+    }
 
-        function hookOnlineApis () {
-            function proxyEvent (e) {
-                cordova.fireWindowEvent(e.type);
-            }
-            // The network module takes care of firing online and offline events.
-            // It currently fires them only on document though, so we bridge them
-            // to window here (while first listening for exec()-releated online/offline
-            // events).
-            window.addEventListener('online', pollOnceFromOnlineEvent, false);
-            window.addEventListener('offline', pollOnceFromOnlineEvent, false);
-            cordova.addWindowEventHandler('online');
-            cordova.addWindowEventHandler('offline');
-            document.addEventListener('online', proxyEvent, false);
-            document.addEventListener('offline', proxyEvent, false);
+    guid = handleEvent.observer_guid;
+    handler = this.handlers[guid];
+    if (handler) {
+        delete this.handlers[guid];
+        this.numHandlers--;
+        if (this.numHandlers === 0) {
+            this.onHasSubscribersChange && this.onHasSubscribersChange();
         }
-
-        hookOnlineApis();
-
-        androidExec.jsToNativeModes = jsToNativeModes;
-        androidExec.nativeToJsModes = nativeToJsModes;
-
-        androidExec.setJsToNativeBridgeMode = function (mode) {
-            if (mode === jsToNativeModes.JS_OBJECT && !window._cordovaNative) {
-                mode = jsToNativeModes.PROMPT;
-            }
-            nativeApiProvider.setPreferPrompt(mode === jsToNativeModes.PROMPT);
-            jsToNativeBridgeMode = mode;
-        };
-
-        androidExec.setNativeToJsBridgeMode = function (mode) {
-            if (mode === nativeToJsBridgeMode) {
-                return;
-            }
-            if (nativeToJsBridgeMode === nativeToJsModes.POLLING) {
-                pollEnabled = false;
-            }
-
-            nativeToJsBridgeMode = mode;
-            // Tell the native side to switch modes.
-            // Otherwise, it will be set by androidExec.init()
-            if (bridgeSecret >= 0) {
-                nativeApiProvider.get().setNativeToJsBridgeMode(bridgeSecret, mode);
-            }
-
-            if (mode === nativeToJsModes.POLLING) {
-                pollEnabled = true;
-                setTimeout(pollingTimerFunc, 1);
-            }
-        };
-
-        function buildPayload (payload, message) {
-            var payloadKind = message.charAt(0);
-            if (payloadKind === 's') {
-                payload.push(message.slice(1));
-            } else if (payloadKind === 't') {
-                payload.push(true);
-            } else if (payloadKind === 'f') {
-                payload.push(false);
-            } else if (payloadKind === 'N') {
-                payload.push(null);
-            } else if (payloadKind === 'n') {
-                payload.push(+message.slice(1));
-            } else if (payloadKind === 'A') {
-                var data = message.slice(1);
-                payload.push(base64.toArrayBuffer(data));
-            } else if (payloadKind === 'S') {
-                payload.push(window.atob(message.slice(1)));
-            } else if (payloadKind === 'M') {
-                var multipartMessages = message.slice(1);
-                while (multipartMessages !== '') {
-                    var spaceIdx = multipartMessages.indexOf(' ');
-                    var msgLen = +multipartMessages.slice(0, spaceIdx);
-                    var multipartMessage = multipartMessages.substr(spaceIdx + 1, msgLen);
-                    multipartMessages = multipartMessages.slice(spaceIdx + msgLen + 1);
-                    buildPayload(payload, multipartMessage);
-                }
-            } else {
-                payload.push(JSON.parse(message));
-            }
+    }
+};
+
+/**
+ * Calls all functions subscribed to this channel.
+ */
+Channel.prototype.fire = function(e) {
+    var fail = false,
+        fireArgs = Array.prototype.slice.call(arguments);
+    // Apply stickiness.
+    if (this.state == 1) {
+        this.state = 2;
+        this.fireArgs = fireArgs;
+    }
+    if (this.numHandlers) {
+        // Copy the values first so that it is safe to modify it from within
+        // callbacks.
+        var toCall = [];
+        for (var item in this.handlers) {
+            toCall.push(this.handlers[item]);
         }
-
-        // Processes a single message, as encoded by NativeToJsMessageQueue.java.
-        function processMessage (message) {
-            var firstChar = message.charAt(0);
-            if (firstChar === 'J') {
-                // This is deprecated on the .java side. It doesn't work with CSP enabled.
-                eval(message.slice(1));
-            } else if (firstChar === 'S' || firstChar === 'F') {
-                var success = firstChar === 'S';
-                var keepCallback = message.charAt(1) === '1';
-                var spaceIdx = message.indexOf(' ', 2);
-                var status = +message.slice(2, spaceIdx);
-                var nextSpaceIdx = message.indexOf(' ', spaceIdx + 1);
-                var callbackId = message.slice(spaceIdx + 1, nextSpaceIdx);
-                var payloadMessage = message.slice(nextSpaceIdx + 1);
-                var payload = [];
-                buildPayload(payload, payloadMessage);
-                cordova.callbackFromNative(callbackId, success, status, payload, keepCallback);
-            } else {
-                console.log('processMessage failed: invalid message: ' + JSON.stringify(message));
-            }
+        for (var i = 0; i < toCall.length; ++i) {
+            toCall[i].apply(this, fireArgs);
         }
-
-        function processMessages () {
-            // Check for the reentrant case.
-            if (isProcessing) {
-                return;
-            }
-            if (messagesFromNative.length === 0) {
-                return;
-            }
-            isProcessing = true;
-            try {
-                var msg = popMessageFromQueue();
-                // The Java side can send a * message to indicate that it
-                // still has messages waiting to be retrieved.
-                if (msg === '*' && messagesFromNative.length === 0) {
-                    nextTick(pollOnce);
-                    return;
-                }
-                processMessage(msg);
-            } finally {
-                isProcessing = false;
-                if (messagesFromNative.length > 0) {
-                    nextTick(processMessages);
-                }
-            }
+        if (this.state == 2 && this.numHandlers) {
+            this.numHandlers = 0;
+            this.handlers = {};
+            this.onHasSubscribersChange && this.onHasSubscribersChange();
         }
+    }
+};
+
+
+// defining them here so they are ready super fast!
+// DOM event that is received when the web page is loaded and parsed.
+channel.createSticky('onDOMContentLoaded');
+
+// Event to indicate the Cordova native side is ready.
+channel.createSticky('onNativeReady');
+
+// Event to indicate that all Cordova JavaScript objects have been created
+// and it's time to run plugin constructors.
+channel.createSticky('onCordovaReady');
+
+// Event to indicate that all automatically loaded JS plugins are loaded and ready.
+// FIXME remove this
+channel.createSticky('onPluginsReady');
+
+// Event to indicate that Cordova is ready
+channel.createSticky('onDeviceReady');
+
+// Event to indicate a resume lifecycle event
+channel.create('onResume');
+
+// Event to indicate a pause lifecycle event
+channel.create('onPause');
+
+// Channels that must fire before "deviceready" is fired.
+channel.waitForInitialization('onCordovaReady');
+channel.waitForInitialization('onDOMContentLoaded');
+
+module.exports = channel;
+
+});
+
+// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/exec.js
+define("cordova/exec", function(require, exports, module) {
+
+/**
+ * Execute a cordova command.  It is up to the native side whether this action
+ * is synchronous or asynchronous.  The native side can return:
+ *      Synchronous: PluginResult object as a JSON string
+ *      Asynchronous: Empty string ""
+ * If async, the native side will cordova.callbackSuccess or cordova.callbackError,
+ * depending upon the result of the action.
+ *
+ * @param {Function} success    The success callback
+ * @param {Function} fail       The fail callback
+ * @param {String} service      The name of the service to use
+ * @param {String} action       Action to be run in cordova
+ * @param {String[]} [args]     Zero or more arguments to pass to the method
+ */
+var cordova = require('cordova'),
+    nativeApiProvider = require('cordova/android/nativeapiprovider'),
+    utils = require('cordova/utils'),
+    base64 = require('cordova/base64'),
+    channel = require('cordova/channel'),
+    jsToNativeModes = {
+        PROMPT: 0,
+        JS_OBJECT: 1
+    },
+    nativeToJsModes = {
+        // Polls for messages using the JS->Native bridge.
+        POLLING: 0,
+        // For LOAD_URL to be viable, it would need to have a work-around for
+        // the bug where the soft-keyboard gets dismissed when a message is sent.
+        LOAD_URL: 1,
+        // For the ONLINE_EVENT to be viable, it would need to intercept all event
+        // listeners (both through addEventListener and window.ononline) as well
+        // as set the navigator property itself.
+        ONLINE_EVENT: 2,
+        EVAL_BRIDGE: 3
+    },
+    jsToNativeBridgeMode,  // Set lazily.
+    nativeToJsBridgeMode = nativeToJsModes.EVAL_BRIDGE,
+    pollEnabled = false,
+    bridgeSecret = -1;
+
+var messagesFromNative = [];
+var isProcessing = false;
+var resolvedPromise = typeof Promise == 'undefined' ? null : Promise.resolve();
+var nextTick = resolvedPromise ? function(fn) { resolvedPromise.then(fn); } : function(fn) { setTimeout(fn); };
+
+function androidExec(success, fail, service, action, args) {
+    if (bridgeSecret < 0) {
+        // If we ever catch this firing, we'll need to queue up exec()s
+        // and fire them once we get a secret. For now, I don't think
+        // it's possible for exec() to be called since plugins are parsed but
+        // not run until until after onNativeReady.
+        throw new Error('exec() called without bridgeSecret');
+    }
+    // Set default bridge modes if they have not already been set.
+    // By default, we use the failsafe, since addJavascriptInterface breaks too often
+    if (jsToNativeBridgeMode === undefined) {
+        androidExec.setJsToNativeBridgeMode(jsToNativeModes.JS_OBJECT);
+    }
 
-        function popMessageFromQueue () {
-            var messageBatch = messagesFromNative.shift();
-            if (messageBatch === '*') {
-                return '*';
-            }
+    // If args is not provided, default to an empty array
+    args = args || [];
 
-            var spaceIdx = messageBatch.indexOf(' ');
-            var msgLen = +messageBatch.slice(0, spaceIdx);
-            var message = messageBatch.substr(spaceIdx + 1, msgLen);
-            messageBatch = messageBatch.slice(spaceIdx + msgLen + 1);
-            if (messageBatch) {
-                messagesFromNative.unshift(messageBatch);
-            }
-            return message;
+    // Process any ArrayBuffers in the args into a string.
+    for (var i = 0; i < args.length; i++) {
+        if (utils.typeName(args[i]) == 'ArrayBuffer') {
+            args[i] = base64.fromArrayBuffer(args[i]);
         }
+    }
 
-        module.exports = androidExec;
-
-    });
-
-    // file: src/common/exec/proxy.js
-    define('cordova/exec/proxy', function (require, exports, module) {
-
-        // internal map of proxy function
-        var CommandProxyMap = {};
+    var callbackId = service + cordova.callbackId++,
+        argsJson = JSON.stringify(args);
+    if (success || fail) {
+        cordova.callbacks[callbackId] = {success:success, fail:fail};
+    }
 
-        module.exports = {
+    var msgs = nativeApiProvider.get().exec(bridgeSecret, service, action, callbackId, argsJson);
+    // If argsJson was received by Java as null, try again with the PROMPT bridge mode.
+    // This happens in rare circumstances, such as when certain Unicode characters are passed over the bridge on a Galaxy S2.  See CB-2666.
+    if (jsToNativeBridgeMode == jsToNativeModes.JS_OBJECT && msgs === "@Null arguments.") {
+        androidExec.setJsToNativeBridgeMode(jsToNativeModes.PROMPT);
+        androidExec(success, fail, service, action, args);
+        androidExec.setJsToNativeBridgeMode(jsToNativeModes.JS_OBJECT);
+    } else if (msgs) {
+        messagesFromNative.push(msgs);
+        // Always process async to avoid exceptions messing up stack.
+        nextTick(processMessages);
+    }
+}
+
+androidExec.init = function() {
+    //CB-11828
+    //This failsafe checks the version of Android and if it's Jellybean, it switches it to
+    //using the Online Event bridge for communicating from Native to JS
+    //
+    //It's ugly, but it's necessary.
+    var check = navigator.userAgent.toLowerCase().match(/android\s[0-9].[0-9]/);
+    var version_code = check && check[0].match(/4.[0-3].*/);
+    if (version_code != null && nativeToJsBridgeMode == nativeToJsModes.EVAL_BRIDGE) {
+      nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT;
+    }
 
-            // example: cordova.commandProxy.add("Accelerometer",{getCurrentAcceleration: function(successCallback, errorCallback, options) {...},...);
-            add: function (id, proxyObj) {
-                console.log('adding proxy for ' + id);
-                CommandProxyMap[id] = proxyObj;
-                return proxyObj;
-            },
+    bridgeSecret = +prompt('', 'gap_init:' + nativeToJsBridgeMode);
+    channel.onNativeReady.fire();
+};
 
-            // cordova.commandProxy.remove("Accelerometer");
-            remove: function (id) {
-                var proxy = CommandProxyMap[id];
-                delete CommandProxyMap[id];
-                CommandProxyMap[id] = null;
-                return proxy;
-            },
+function pollOnceFromOnlineEvent() {
+    pollOnce(true);
+}
 
-            get: function (service, action) {
-                return (CommandProxyMap[service] ? CommandProxyMap[service][action] : null);
-            }
-        };
-    });
-
-    // file: src/common/init.js
-    define('cordova/init', function (require, exports, module) {
+function pollOnce(opt_fromOnlineEvent) {
+    if (bridgeSecret < 0) {
+        // This can happen when the NativeToJsMessageQueue resets the online state on page transitions.
+        // We know there's nothing to retrieve, so no need to poll.
+        return;
+    }
+    var msgs = nativeApiProvider.get().retrieveJsMessages(bridgeSecret, !!opt_fromOnlineEvent);
+    if (msgs) {
+        messagesFromNative.push(msgs);
+        // Process sync since we know we're already top-of-stack.
+        processMessages();
+    }
+}
 
-        var channel = require('cordova/channel');
-        var cordova = require('cordova');
-        var modulemapper = require('cordova/modulemapper');
-        var platform = require('cordova/platform');
-        var pluginloader = require('cordova/pluginloader');
-        var utils = require('cordova/utils');
+function pollingTimerFunc() {
+    if (pollEnabled) {
+        pollOnce();
+        setTimeout(pollingTimerFunc, 50);
+    }
+}
 
-        var platformInitChannelsArray = [channel.onNativeReady, channel.onPluginsReady];
+function hookOnlineApis() {
+    function proxyEvent(e) {
+        cordova.fireWindowEvent(e.type);
+    }
+    // The network module takes care of firing online and offline events.
+    // It currently fires them only on document though, so we bridge them
+    // to window here (while first listening for exec()-releated online/offline
+    // events).
+    window.addEventListener('online', pollOnceFromOnlineEvent, false);
+    window.addEventListener('offline', pollOnceFromOnlineEvent, false);
+    cordova.addWindowEventHandler('online');
+    cordova.addWindowEventHandler('offline');
+    document.addEventListener('online', proxyEvent, false);
+    document.addEventListener('offline', proxyEvent, false);
+}
+
+hookOnlineApis();
+
+androidExec.jsToNativeModes = jsToNativeModes;
+androidExec.nativeToJsModes = nativeToJsModes;
+
+androidExec.setJsToNativeBridgeMode = function(mode) {
+    if (mode == jsToNativeModes.JS_OBJECT && !window._cordovaNative) {
+        mode = jsToNativeModes.PROMPT;
+    }
+    nativeApiProvider.setPreferPrompt(mode == jsToNativeModes.PROMPT);
+    jsToNativeBridgeMode = mode;
+};
 
-        function logUnfiredChannels (arr) {
-            for (var i = 0; i < arr.length; ++i) {
-                if (arr[i].state !== 2) {
-                    console.log('Channel not fired: ' + arr[i].type);
-                }
-            }
-        }
+androidExec.setNativeToJsBridgeMode = function(mode) {
+    if (mode == nativeToJsBridgeMode) {
+        return;
+    }
+    if (nativeToJsBridgeMode == nativeToJsModes.POLLING) {
+        pollEnabled = false;
+    }
 
-        window.setTimeout(function () {
-            if (channel.onDeviceReady.state !== 2) {
-                console.log('deviceready has not fired after 5 seconds.');
-                logUnfiredChannels(platformInitChannelsArray);
-                logUnfiredChannels(channel.deviceReadyChannelsArray);
-            }
-        }, 5000);
-
-        // Replace navigator before any modules are required(), to ensure it happens as soon as possible.
-        // We replace it so that properties that can't be clobbered can instead be overridden.
-        function replaceNavigator (origNavigator) {
-            var CordovaNavigator = function () {};
-            CordovaNavigator.prototype = origNavigator;
-            var newNavigator = new CordovaNavigator();
-            // This work-around really only applies to new APIs that are newer than Function.bind.
-            // Without it, APIs such as getGamepads() break.
-            if (CordovaNavigator.bind) {
-                for (var key in origNavigator) {
-                    if (typeof origNavigator[key] === 'function') {
-                        newNavigator[key] = origNavigator[key].bind(origNavigator);
-                    } else {
-                        (function (k) {
-                            utils.defineGetterSetter(newNavigator, key, function () {
-                                return origNavigator[k];
-                            });
-                        })(key);
-                    }
-                }
-            }
-            return newNavigator;
-        }
+    nativeToJsBridgeMode = mode;
+    // Tell the native side to switch modes.
+    // Otherwise, it will be set by androidExec.init()
+    if (bridgeSecret >= 0) {
+        nativeApiProvider.get().setNativeToJsBridgeMode(bridgeSecret, mode);
+    }
 
-        if (window.navigator) {
-            window.navigator = replaceNavigator(window.navigator);
+    if (mode == nativeToJsModes.POLLING) {
+        pollEnabled = true;
+        setTimeout(pollingTimerFunc, 1);
+    }
+};
+
+function buildPayload(payload, message) {
+    var payloadKind = message.charAt(0);
+    if (payloadKind == 's') {
+        payload.push(message.slice(1));
+    } else if (payloadKind == 't') {
+        payload.push(true);
+    } else if (payloadKind == 'f') {
+        payload.push(false);
+    } else if (payloadKind == 'N') {
+        payload.push(null);
+    } else if (payloadKind == 'n') {
+        payload.push(+message.slice(1));
+    } else if (payloadKind == 'A') {
+        var data = message.slice(1);
+        payload.push(base64.toArrayBuffer(data));
+    } else if (payloadKind == 'S') {
+        payload.push(window.atob(message.slice(1)));
+    } else if (payloadKind == 'M') {
+        var multipartMessages = message.slice(1);
+        while (multipartMessages !== "") {
+            var spaceIdx = multipartMessages.indexOf(' ');
+            var msgLen = +multipartMessages.slice(0, spaceIdx);
+            var multipartMessage = multipartMessages.substr(spaceIdx + 1, msgLen);
+            multipartMessages = multipartMessages.slice(spaceIdx + msgLen + 1);
+            buildPayload(payload, multipartMessage);
         }
+    } else {
+        payload.push(JSON.parse(message));
+    }
+}
+
+// Processes a single message, as encoded by NativeToJsMessageQueue.java.
+function processMessage(message) {
+    var firstChar = message.charAt(0);
+    if (firstChar == 'J') {
+        // This is deprecated on the .java side. It doesn't work with CSP enabled.
+        eval(message.slice(1));
+    } else if (firstChar == 'S' || firstChar == 'F') {
+        var success = firstChar == 'S';
+        var keepCallback = message.charAt(1) == '1';
+        var spaceIdx = message.indexOf(' ', 2);
+        var status = +message.slice(2, spaceIdx);
+        var nextSpaceIdx = message.indexOf(' ', spaceIdx + 1);
+        var callbackId = message.slice(spaceIdx + 1, nextSpaceIdx);
+        var payloadMessage = message.slice(nextSpaceIdx + 1);
+        var payload = [];
+        buildPayload(payload, payloadMessage);
+        cordova.callbackFromNative(callbackId, success, status, payload, keepCallback);
+    } else {
+        console.log("processMessage failed: invalid message: " + JSON.stringify(message));
+    }
+}
 
-        if (!window.console) {
-            window.console = {
-                log: function () {}
-            };
-        }
-        if (!window.console.warn) {
-            window.console.warn = function (msg) {
-                this.log('warn: ' + msg);
-            };
+function processMessages() {
+    // Check for the reentrant case.
+    if (isProcessing) {
+        return;
+    }
+    if (messagesFromNative.length === 0) {
+        return;
+    }
+    isProcessing = true;
+    try {
+        var msg = popMessageFromQueue();
+        // The Java side can send a * message to indicate that it
+        // still has messages waiting to be retrieved.
+        if (msg == '*' && messagesFromNative.length === 0) {
+            nextTick(pollOnce);
+            return;
         }
-
-        // Register pause, resume and deviceready channels as events on document.
-        channel.onPause = cordova.addDocumentEventHandler('pause');
-        channel.onResume = cordova.addDocumentEventHandler('resume');
-        channel.onActivated = cordova.addDocumentEventHandler('activated');
-        channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');
-
-        // Listen for DOMContentLoaded and notify our channel subscribers.
-        if (document.readyState === 'complete' || document.readyState === 'interactive') {
-            channel.onDOMContentLoaded.fire();
-        } else {
-            document.addEventListener('DOMContentLoaded', function () {
-                channel.onDOMContentLoaded.fire();
-            }, false);
+        processMessage(msg);
+    } finally {
+        isProcessing = false;
+        if (messagesFromNative.length > 0) {
+            nextTick(processMessages);
         }
+    }
+}
 
-        // _nativeReady is global variable that the native side can set
-        // to signify that the native code is ready. It is a global since
-        // it may be called before any cordova JS is ready.
-        if (window._nativeReady) {
-            channel.onNativeReady.fire();
-        }
+function popMessageFromQueue() {
+    var messageBatch = messagesFromNative.shift();
+    if (messageBatch == '*') {
+        return '*';
+    }
 
-        modulemapper.clobbers('cordova', 'cordova');
-        modulemapper.clobbers('cordova/exec', 'cordova.exec');
-        modulemapper.clobbers('cordova/exec', 'Cordova.exec');
+    var spaceIdx = messageBatch.indexOf(' ');
+    var msgLen = +messageBatch.slice(0, spaceIdx);
+    var message = messageBatch.substr(spaceIdx + 1, msgLen);
+    messageBatch = messageBatch.slice(spaceIdx + msgLen + 1);
+    if (messageBatch) {
+        messagesFromNative.unshift(messageBatch);
+    }
+    return message;
+}
 
-        // Call the platform-specific initialization.
-        platform.bootstrap && platform.bootstrap();
+module.exports = androidExec;
 
-        // Wrap in a setTimeout to support the use-case of having plugin JS appended to cordova.js.
-        // The delay allows the attached modules to be defined before the plugin loader looks for them.
-        setTimeout(function () {
-            pluginloader.load(function () {
-                channel.onPluginsReady.fire();
-            });
-        }, 0);
+});
 
-        /**
-         * Create all cordova objects once native side is ready.
-         */
-        channel.join(function () {
-            modulemapper.mapModules(window);
+// file: src/common/exec/proxy.js
+define("cordova/exec/proxy", function(require, exports, module) {
 
-            platform.initialize && platform.initialize();
 
-            // Fire event to notify that all objects are created
-            channel.onCordovaReady.fire();
+// internal map of proxy function
+var CommandProxyMap = {};
 
-            // Fire onDeviceReady event once page has fully loaded, all
-            // constructors have run and cordova info has been received from native
-            // side.
-            channel.join(function () {
-                require('cordova').fireDocumentEvent('deviceready');
-            }, channel.deviceReadyChannelsArray);
+module.exports = {
 
-        }, platformInitChannelsArray);
+    // example: cordova.commandProxy.add("Accelerometer",{getCurrentAcceleration: function(successCallback, errorCallback, options) {...},...);
+    add:function(id,proxyObj) {
+        console.log("adding proxy for " + id);
+        CommandProxyMap[id] = proxyObj;
+        return proxyObj;
+    },
 
-    });
+    // cordova.commandProxy.remove("Accelerometer");
+    remove:function(id) {
+        var proxy = CommandProxyMap[id];
+        delete CommandProxyMap[id];
+        CommandProxyMap[id] = null;
+        return proxy;
+    },
 
-    // file: src/common/init_b.js
-    define('cordova/init_b', function (require, exports, module) {
+    get:function(service,action) {
+        return ( CommandProxyMap[service] ? CommandProxyMap[service][action] : null );
+    }
+};
+});
 
-        var channel = require('cordova/channel');
-        var cordova = require('cordova');
-        var modulemapper = require('cordova/modulemapper');
-        var platform = require('cordova/platform');
-        var pluginloader = require('cordova/pluginloader');
-        var utils = require('cordova/utils');
+// file: src/common/init.js
+define("cordova/init", function(require, exports, module) {
 
-        var platformInitChannelsArray = [channel.onDOMContentLoaded, channel.onNativeReady, channel.onPluginsReady];
+var channel = require('cordova/channel');
+var cordova = require('cordova');
+var modulemapper = require('cordova/modulemapper');
+var platform = require('cordova/platform');
+var pluginloader = require('cordova/pluginloader');
+var utils = require('cordova/utils');
 
-        // setting exec
-        cordova.exec = require('cordova/exec');
+var platformInitChannelsArray = [channel.onNativeReady, channel.onPluginsReady];
 
-        function logUnfiredChannels (arr) {
-            for (var i = 0; i < arr.length; ++i) {
-                if (arr[i].state !== 2) {
-                    console.log('Channel not fired: ' + arr[i].type);
-                }
-            }
+function logUnfiredChannels(arr) {
+    for (var i = 0; i < arr.length; ++i) {
+        if (arr[i].state != 2) {
+            console.log('Channel not fired: ' + arr[i].type);
         }
+    }
+}
 
-        window.setTimeout(function () {
-            if (channel.onDeviceReady.state !== 2) {
-                console.log('deviceready has not fired after 5 seconds.');
-                logUnfiredChannels(platformInitChannelsArray);
-                logUnfiredChannels(channel.deviceReadyChannelsArray);
-            }
-        }, 5000);
-
-        // Replace navigator before any modules are required(), to ensure it happens as soon as possible.
-        // We replace it so that properties that can't be clobbered can instead be overridden.
-        function replaceNavigator (origNavigator) {
-            var CordovaNavigator = function () {};
-            CordovaNavigator.prototype = origNavigator;
-            var newNavigator = new CordovaNavigator();
-            // This work-around really only applies to new APIs that are newer than Function.bind.
-            // Without it, APIs such as getGamepads() break.
-            if (CordovaNavigator.bind) {
-                for (var key in origNavigator) {
-                    if (typeof origNavigator[key] === 'function') {
-                        newNavigator[key] = origNavigator[key].bind(origNavigator);
-                    } else {
-                        (function (k) {
-                            utils.defineGetterSetter(newNavigator, key, function () {
-                                return origNavigator[k];
-                            });
-                        })(key);
-                    }
-                }
+window.setTimeout(function() {
+    if (channel.onDeviceReady.state != 2) {
+        console.log('deviceready has not fired after 5 seconds.');
+        logUnfiredChannels(platformInitChannelsArray);
+        logUnfiredChannels(channel.deviceReadyChannelsArray);
+    }
+}, 5000);
+
+// Replace navigator before any modules are required(), to ensure it happens as soon as possible.
+// We replace it so that properties that can't be clobbered can instead be overridden.
+function replaceNavigator(origNavigator) {
+    var CordovaNavigator = function() {};
+    CordovaNavigator.prototype = origNavigator;
+    var newNavigator = new CordovaNavigator();
+    // This work-around really only applies to new APIs that are newer than Function.bind.
+    // Without it, APIs such as getGamepads() break.
+    if (CordovaNavigator.bind) {
+        for (var key in origNavigator) {
+            if (typeof origNavigator[key] == 'function') {
+                newNavigator[key] = origNavigator[key].bind(origNavigator);
+            }
+            else {
+                (function(k) {
+                    utils.defineGetterSetter(newNavigator,key,function() {
+                        return origNavigator[k];
+                    });
+                })(key);
             }
-            return newNavigator;
-        }
-        if (window.navigator) {
-            window.navigator = replaceNavigator(window.navigator);
         }
+    }
+    return newNavigator;
+}
+
+if (window.navigator) {
+    window.navigator = replaceNavigator(window.navigator);
+}
+
+if (!window.console) {
+    window.console = {
+        log: function(){}
+    };
+}
+if (!window.console.warn) {
+    window.console.warn = function(msg) {
+        this.log("warn: " + msg);
+    };
+}
+
+// Register pause, resume and deviceready channels as events on document.
+channel.onPause = cordova.addDocumentEventHandler('pause');
+channel.onResume = cordova.addDocumentEventHandler('resume');
+channel.onActivated = cordova.addDocumentEventHandler('activated');
+channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');
+
+// Listen for DOMContentLoaded and notify our channel subscribers.
+if (document.readyState == 'complete' || document.readyState == 'interactive') {
+    channel.onDOMContentLoaded.fire();
+} else {
+    document.addEventListener('DOMContentLoaded', function() {
+        channel.onDOMContentLoaded.fire();
+    }, false);
+}
+
+// _nativeReady is global variable that the native side can set
+// to signify that the native code is ready. It is a global since
+// it may be called before any cordova JS is ready.
+if (window._nativeReady) {
+    channel.onNativeReady.fire();
+}
+
+modulemapper.clobbers('cordova', 'cordova');
+modulemapper.clobbers('cordova/exec', 'cordova.exec');
+modulemapper.clobbers('cordova/exec', 'Cordova.exec');
+
+// Call the platform-specific initialization.
+platform.bootstrap && platform.bootstrap();
+
+// Wrap in a setTimeout to support the use-case of having plugin JS appended to cordova.js.
+// The delay allows the attached modules to be defined before the plugin loader looks for them.
+setTimeout(function() {
+    pluginloader.load(function() {
+        channel.onPluginsReady.fire();
+    });
+}, 0);
 
-        if (!window.console) {
-            window.console = {
-                log: function () {}
-            };
-        }
-        if (!window.console.warn) {
-            window.console.warn = function (msg) {
-                this.log('warn: ' + msg);
-            };
-        }
+/**
+ * Create all cordova objects once native side is ready.
+ */
+channel.join(function() {
+    modulemapper.mapModules(window);
 
-        // Register pause, resume and deviceready channels as events on document.
-        channel.onPause = cordova.addDocumentEventHandler('pause');
-        channel.onResume = cordova.addDocumentEventHandler('resume');
-        channel.onActivated = cordova.addDocumentEventHandler('activated');
-        channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');
+    platform.initialize && platform.initialize();
 
-        // Listen for DOMContentLoaded and notify our channel subscribers.
-        if (document.readyState === 'complete' || document.readyState === 'interactive') {
-            channel.onDOMContentLoaded.fire();
-        } else {
-            document.addEventListener('DOMContentLoaded', function () {
-                channel.onDOMContentLoaded.fire();
-            }, false);
-        }
+    // Fire event to notify that all objects are created
+    channel.onCordovaReady.fire();
 
-        // _nativeReady is global variable that the native side can set
-        // to signify that the native code is ready. It is a global since
-        // it may be called before any cordova JS is ready.
-        if (window._nativeReady) {
-            channel.onNativeReady.fire();
-        }
+    // Fire onDeviceReady event once page has fully loaded, all
+    // constructors have run and cordova info has been received from native
+    // side.
+    channel.join(function() {
+        require('cordova').fireDocumentEvent('deviceready');
+    }, channel.deviceReadyChannelsArray);
 
-        // Call the platform-specific initialization.
-        platform.bootstrap && platform.bootstrap();
+}, platformInitChannelsArray);
 
-        // Wrap in a setTimeout to support the use-case of having plugin JS appended to cordova.js.
-        // The delay allows the attached modules to be defined before the plugin loader looks for them.
-        setTimeout(function () {
-            pluginloader.load(function () {
-                channel.onPluginsReady.fire();
-            });
-        }, 0);
 
-        /**
-         * Create all cordova objects once native side is ready.
-         */
-        channel.join(function () {
-            modulemapper.mapModules(window);
+});
+
+// file: src/common/init_b.js
+define("cordova/init_b", function(require, exports, module) {
 
-            platform.initialize && platform.initialize();
+var channel = require('cordova/channel');
+var cordova = require('cordova');
+var modulemapper = require('cordova/modulemapper');
+var platform = require('cordova/platform');
+var pluginloader = require('cordova/pluginloader');
+var utils = require('cordova/utils');
 
-            // Fire event to notify that all objects are created
-            channel.onCordovaReady.fire();
+var platformInitChannelsArray = [channel.onDOMContentLoaded, channel.onNativeReady, channel.onPluginsReady];
 
-            // Fire onDeviceReady event once page has fully loaded, all
-            // constructors have run and cordova info has been received from native
-            // side.
-            channel.join(function () {
-                require('cordova').fireDocumentEvent('deviceready');
-            }, channel.deviceReadyChannelsArray);
+// setting exec
+cordova.exec = require('cordova/exec');
 
-        }, platformInitChannelsArray);
+function logUnfiredChannels(arr) {
+    for (var i = 0; i < arr.length; ++i) {
+        if (arr[i].state != 2) {
+            console.log('Channel not fired: ' + arr[i].type);
+        }
+    }
+}
 
+window.setTimeout(function() {
+    if (channel.onDeviceReady.state != 2) {
+        console.log('deviceready has not fired after 5 seconds.');
+        logUnfiredChannels(platformInitChannelsArray);
+        logUnfiredChannels(channel.deviceReadyChannelsArray);
+    }
+}, 5000);
+
+// Replace navigator before any modules are required(), to ensure it happens as soon as possible.
+// We replace it so that properties that can't be clobbered can instead be overridden.
+function replaceNavigator(origNavigator) {
+    var CordovaNavigator = function() {};
+    CordovaNavigator.prototype = origNavigator;
+    var newNavigator = new CordovaNavigator();
+    // This work-around really only applies to new APIs that are newer than Function.bind.
+    // Without it, APIs such as getGamepads() break.
+    if (CordovaNavigator.bind) {
+        for (var key in origNavigator) {
+            if (typeof origNavigator[key] == 'function') {
+                newNavigator[key] = origNavigator[key].bind(origNavigator);
+            }
+            else {
+                (function(k) {
+                    utils.defineGetterSetter(newNavigator,key,function() {
+                        return origNavigator[k];
+                    });
+                })(key);
+            }
+        }
+    }
+    return newNavigator;
+}
+if (window.navigator) {
+    window.navigator = replaceNavigator(window.navigator);
+}
+
+if (!window.console) {
+    window.console = {
+        log: function(){}
+    };
+}
+if (!window.console.warn) {
+    window.console.warn = function(msg) {
+        this.log("warn: " + msg);
+    };
+}
+
+// Register pause, resume and deviceready channels as events on document.
+channel.onPause = cordova.addDocumentEventHandler('pause');
+channel.onResume = cordova.addDocumentEventHandler('resume');
+channel.onActivated = cordova.addDocumentEventHandler('activated');
+channel.onDeviceReady = cordova.addStickyDocumentEventHandler('deviceready');
+
+// Listen for DOMContentLoaded and notify our channel subscribers.
+if (document.readyState == 'complete' || document.readyState == 'interactive') {
+    channel.onDOMContentLoaded.fire();
+} else {
+    document.addEventListener('DOMContentLoaded', function() {
+        channel.onDOMContentLoaded.fire();
+    }, false);
+}
+
+// _nativeReady is global variable that the native side can set
+// to signify that the native code is ready. It is a global since
+// it may be called before any cordova JS is ready.
+if (window._nativeReady) {
+    channel.onNativeReady.fire();
+}
+
+// Call the platform-specific initialization.
+platform.bootstrap && platform.bootstrap();
+
+// Wrap in a setTimeout to support the use-case of having plugin JS appended to cordova.js.
+// The delay allows the attached modules to be defined before the plugin loader looks for them.
+setTimeout(function() {
+    pluginloader.load(function() {
+        channel.onPluginsReady.fire();
     });
+}, 0);
 
-    // file: src/common/modulemapper.js
-    define('cordova/modulemapper', function (require, exports, module) {
+/**
+ * Create all cordova objects once native side is ready.
+ */
+channel.join(function() {
+    modulemapper.mapModules(window);
 
-        var builder = require('cordova/builder');
-        var moduleMap = define.moduleMap;
-        var symbolList;
-        var deprecationMap;
+    platform.initialize && platform.initialize();
 
-        exports.reset = function () {
-            symbolList = [];
-            deprecationMap = {};
-        };
+    // Fire event to notify that all objects are created
+    channel.onCordovaReady.fire();
 
-        function addEntry (strategy, moduleName, symbolPath, opt_deprecationMessage) {
-            if (!(moduleName in moduleMap)) {
-                throw new Error('Module ' + moduleName + ' does not exist.');
-            }
-            symbolList.push(strategy, moduleName, symbolPath);
-            if (opt_deprecationMessage) {
-                deprecationMap[symbolPath] = opt_deprecationMessage;
-            }
-        }
+    // Fire onDeviceReady event once page has fully loaded, all
+    // constructors have run and cordova info has been received from native
+    // side.
+    channel.join(function() {
+        require('cordova').fireDocumentEvent('deviceready');
+    }, channel.deviceReadyChannelsArray);
 
-        // Note: Android 2.3 does have Function.bind().
-        exports.clobbers = function (moduleName, symbolPath, opt_deprecationMessage) {
-            addEntry('c', moduleName, symbolPath, opt_deprecationMessage);
-        };
+}, platformInitChannelsArray);
 
-        exports.merges = function (moduleName, symbolPath, opt_deprecationMessage) {
-            addEntry('m', moduleName, symbolPath, opt_deprecationMessage);
-        };
+});
 
-        exports.defaults = function (moduleName, symbolPath, opt_deprecationMessage) {
-            addEntry('d', moduleName, symbolPath, opt_deprecationMessage);
-        };
+// file: src/common/modulemapper.js
+define("cordova/modulemapper", function(require, exports, module) {
 
-        exports.runs = function (moduleName) {
-            addEntry('r', moduleName, null);
-        };
+var builder = require('cordova/builder'),
+    moduleMap = define.moduleMap,
+    symbolList,
+    deprecationMap;
 
-        function prepareNamespace (symbolPath, context) {
-            if (!symbolPath) {
-                return context;
-            }
-            var parts = symbolPath.split('.');
-            var cur = context;
-            for (var i = 0, part; part = parts[i]; ++i) {
-                cur = cur[part] = cur[part] || {};
-            }
-            return cur;
-        }
+exports.reset = function() {
+    symbolList = [];
+    deprecationMap = {};
+};
 
-        exports.mapModules = function (context) {
-            var origSymbols = {};
-            context.CDV_origSymbols = origSymbols;
-            for (var i = 0, len = symbolList.length; i < len; i += 3) {
-                var strategy = symbolList[i];
-                var moduleName = symbolList[i + 1];
-                var module = require(moduleName);
-                // <runs/>
-                if (strategy === 'r') {
-                    continue;
-                }
-                var symbolPath = symbolList[i + 2];
-                var lastDot = symbolPath.lastIndexOf('.');
-                var namespace = symbolPath.substr(0, lastDot);
-                var lastName = symbolPath.substr(lastDot + 1);
-
-                var deprecationMsg = symbolPath in deprecationMap ? 'Access made to deprecated symbol: ' + symbolPath + '. ' + deprecationMsg : null;
-                var parentObj = prepareNamespace(namespace, context);
-                var target = parentObj[lastName];
-
-                if (strategy === 'm' && target) {
-                    builder.recursiveMerge(target, module);
-                } else if ((strategy === 'd' && !target) || (strategy !== 'd')) {
-                    if (!(symbolPath in origSymbols)) {
-                        origSymbols[symbolPath] = target;
-                    }
-                    builder.assignOrWrapInDeprecateGetter(parentObj, lastName, module, deprecationMsg);
-                }
-            }
-        };
+function addEntry(strategy, moduleName, symbolPath, opt_deprecationMessage) {
+    if (!(moduleName in moduleMap)) {
+        throw new Error('Module ' + moduleName + ' does not exist.');
+    }
+    symbolList.push(strategy, moduleName, symbolPath);
+    if (opt_deprecationMessage) {
+        deprecationMap[symbolPath] = opt_deprecationMessage;
+    }
+}
 
-        exports.getOriginalSymbol = function (context, symbolPath) {
-            var origSymbols = context.CDV_origSymbols;
-            if (origSymbols && (symbolPath in origSymbols)) {
-                return origSymbols[symbolPath];
-            }
-            var parts = symbolPath.split('.');
-            var obj = context;
-            for (var i = 0; i < parts.length; ++i) {
-                obj = obj && obj[parts[i]];
-            }
-            return obj;
-        };
+// Note: Android 2.3 does have Function.bind().
+exports.clobbers = function(moduleName, symbolPath, opt_deprecationMessage) {
+    addEntry('c', moduleName, symbolPath, opt_deprecationMessage);
+};
 
-        exports.reset();
+exports.merges = function(moduleName, symbolPath, opt_deprecationMessage) {
+    addEntry('m', moduleName, symbolPath, opt_deprecationMessage);
+};
 
-    });
+exports.defaults = function(moduleName, symbolPath, opt_deprecationMessage) {
+    addEntry('d', moduleName, symbolPath, opt_deprecationMessage);
+};
 
-    // file: src/common/modulemapper_b.js
-    define('cordova/modulemapper_b', function (require, exports, module) {
+exports.runs = function(moduleName) {
+    addEntry('r', moduleName, null);
+};
 
-        var builder = require('cordova/builder');
-        var symbolList = [];
-        var deprecationMap;
+function prepareNamespace(symbolPath, context) {
+    if (!symbolPath) {
+        return context;
+    }
+    var parts = symbolPath.split('.');
+    var cur = context;
+    for (var i = 0, part; part = parts[i]; ++i) {
+        cur = cur[part] = cur[part] || {};
+    }
+    return cur;
+}
+
+exports.mapModules = function(context) {
+    var origSymbols = {};
+    context.CDV_origSymbols = origSymbols;
+    for (var i = 0, len = symbolList.length; i < len; i += 3) {
+        var strategy = symbolList[i];
+        var moduleName = symbolList[i + 1];
+        var module = require(moduleName);
+        // <runs/>
+        if (strategy == 'r') {
+            continue;
+        }
+        var symbolPath = symbolList[i + 2];
+        var lastDot = symbolPath.lastIndexOf('.');
+        var namespace = symbolPath.substr(0, lastDot);
+        var lastName = symbolPath.substr(lastDot + 1);
+
+        var deprecationMsg = symbolPath in deprecationMap ? 'Access made to deprecated symbol: ' + symbolPath + '. ' + deprecationMsg : null;
+        var parentObj = prepareNamespace(namespace, context);
+        var target = parentObj[lastName];
+
+        if (strategy == 'm' && target) {
+            builder.recursiveMerge(target, module);
+        } else if ((strategy == 'd' && !target) || (strategy != 'd')) {
+            if (!(symbolPath in origSymbols)) {
+                origSymbols[symbolPath] = target;
+            }
+            builder.assignOrWrapInDeprecateGetter(parentObj, lastName, module, deprecationMsg);
+        }
+    }
+};
 
-        exports.reset = function () {
-            symbolList = [];
-            deprecationMap = {};
-        };
+exports.getOriginalSymbol = function(context, symbolPath) {
+    var origSymbols = context.CDV_origSymbols;
+    if (origSymbols && (symbolPath in origSymbols)) {
+        return origSymbols[symbolPath];
+    }
+    var parts = symbolPath.split('.');
+    var obj = context;
+    for (var i = 0; i < parts.length; ++i) {
+        obj = obj && obj[parts[i]];
+    }
+    return obj;
+};
 
-        function addEntry (strategy, moduleName, symbolPath, opt_deprecationMessage) {
-            symbolList.push(strategy, moduleName, symbolPath);
-            if (opt_deprecationMessage) {
-                deprecationMap[symbolPath] = opt_deprecationMessage;
-            }
-        }
+exports.reset();
 
-        // Note: Android 2.3 does have Function.bind().
-        exports.clobbers = function (moduleName, symbolPath, opt_deprecationMessage) {
-            addEntry('c', moduleName, symbolPath, opt_deprecationMessage);
-        };
 
-        exports.merges = function (moduleName, symbolPath, opt_deprecationMessage) {
-            addEntry('m', moduleName, symbolPath, opt_deprecationMessage);
-        };
+});
 
-        exports.defaults = function (moduleName, symbolPath, opt_deprecationMessage) {
-            addEntry('d', moduleName, symbolPath, opt_deprecationMessage);
-        };
+// file: src/common/modulemapper_b.js
+define("cordova/modulemapper_b", function(require, exports, module) {
 
-        exports.runs = function (moduleName) {
-            addEntry('r', moduleName, null);
-        };
+var builder = require('cordova/builder'),
+    symbolList = [],
+    deprecationMap;
 
-        function prepareNamespace (symbolPath, context) {
-            if (!symbolPath) {
-                return context;
-            }
-            var parts = symbolPath.split('.');
-            var cur = context;
-            for (var i = 0, part; part = parts[i]; ++i) {
-                cur = cur[part] = cur[part] || {};
-            }
-            return cur;
-        }
+exports.reset = function() {
+    symbolList = [];
+    deprecationMap = {};
+};
 
-        exports.mapModules = function (context) {
-            var origSymbols = {};
-            context.CDV_origSymbols = origSymbols;
-            for (var i = 0, len = symbolList.length; i < len; i += 3) {
-                var strategy = symbolList[i];
-                var moduleName = symbolList[i + 1];
-                var module = require(moduleName);
-                // <runs/>
-                if (strategy === 'r') {
-                    continue;
-                }
-                var symbolPath = symbolList[i + 2];
-                var lastDot = symbolPath.lastIndexOf('.');
-                var namespace = symbolPath.substr(0, lastDot);
-                var lastName = symbolPath.substr(lastDot + 1);
-
-                var deprecationMsg = symbolPath in deprecationMap ? 'Access made to deprecated symbol: ' + symbolPath + '. ' + deprecationMsg : null;
-                var parentObj = prepareNamespace(namespace, context);
-                var target = parentObj[lastName];
-
-                if (strategy === 'm' && target) {
-                    builder.recursiveMerge(target, module);
-                } else if ((strategy === 'd' && !target) || (strategy !== 'd')) {
-                    if (!(symbolPath in origSymbols)) {
-                        origSymbols[symbolPath] = target;
-                    }
-                    builder.assignOrWrapInDeprecateGetter(parentObj, lastName, module, deprecationMsg);
-                }
-            }
-        };
+function addEntry(strategy, moduleName, symbolPath, opt_deprecationMessage) {
+    symbolList.push(strategy, moduleName, symbolPath);
+    if (opt_deprecationMessage) {
+        deprecationMap[symbolPath] = opt_deprecationMessage;
+    }
+}
 
-        exports.getOriginalSymbol = function (context, symbolPath) {
-            var origSymbols = context.CDV_origSymbols;
-            if (origSymbols && (symbolPath in origSymbols)) {
-                return origSymbols[symbolPath];
-            }
-            var parts = symbolPath.split('.');
-            var obj = context;
-            for (var i = 0; i < parts.length; ++i) {
-                obj = obj && obj[parts[i]];
-            }
-            return obj;
-        };
+// Note: Android 2.3 does have Function.bind().
+exports.clobbers = function(moduleName, symbolPath, opt_deprecationMessage) {
+    addEntry('c', moduleName, symbolPath, opt_deprecationMessage);
+};
 
-        exports.reset();
+exports.merges = function(moduleName, symbolPath, opt_deprecationMessage) {
+    addEntry('m', moduleName, symbolPath, opt_deprecationMessage);
+};
 
-    });
+exports.defaults = function(moduleName, symbolPath, opt_deprecationMessage) {
+    addEntry('d', moduleName, symbolPath, opt_deprecationMessage);
+};
 
-    // file: /Users/maj/src/cordova-android/cordova-js-src/platform.js
-    define('cordova/platform', function (require, exports, module) {
+exports.runs = function(moduleName) {
+    addEntry('r', moduleName, null);
+};
 
-        // The last resume event that was received that had the result of a plugin call.
-        var lastResumeEvent = null;
+function prepareNamespace(symbolPath, context) {
+    if (!symbolPath) {
+        return context;
+    }
+    var parts = symbolPath.split('.');
+    var cur = context;
+    for (var i = 0, part; part = parts[i]; ++i) {
+        cur = cur[part] = cur[part] || {};
+    }
+    return cur;
+}
+
+exports.mapModules = function(context) {
+    var origSymbols = {};
+    context.CDV_origSymbols = origSymbols;
+    for (var i = 0, len = symbolList.length; i < len; i += 3) {
+        var strategy = symbolList[i];
+        var moduleName = symbolList[i + 1];
+        var module = require(moduleName);
+        // <runs/>
+        if (strategy == 'r') {
+            continue;
+        }
+        var symbolPath = symbolList[i + 2];
+        var lastDot = symbolPath.lastIndexOf('.');
+        var namespace = symbolPath.substr(0, lastDot);
+        var lastName = symbolPath.substr(lastDot + 1);
+
+        var deprecationMsg = symbolPath in deprecationMap ? 'Access made to deprecated symbol: ' + symbolPath + '. ' + deprecationMsg : null;
+        var parentObj = prepareNamespace(namespace, context);
+        var target = parentObj[lastName];
+
+        if (strategy == 'm' && target) {
+            builder.recursiveMerge(target, module);
+        } else if ((strategy == 'd' && !target) || (strategy != 'd')) {
+            if (!(symbolPath in origSymbols)) {
+                origSymbols[symbolPath] = target;
+            }
+            builder.assignOrWrapInDeprecateGetter(parentObj, lastName, module, deprecationMsg);
+        }
+    }
+};
 
-        module.exports = {
-            id: 'android',
-            bootstrap: function () {
-                var channel = require('cordova/channel');
-                var cordova = require('cordova');
-                var exec = require('cordova/exec');
-                var modulemapper = require('cordova/modulemapper');
+exports.getOriginalSymbol = function(context, symbolPath) {
+    var origSymbols = context.CDV_origSymbols;
+    if (origSymbols && (symbolPath in origSymbols)) {
+        return origSymbols[symbolPath];
+    }
+    var parts = symbolPath.split('.');
+    var obj = context;
+    for (var i = 0; i < parts.length; ++i) {
+        obj = obj && obj[parts[i]];
+    }
+    return obj;
+};
 
-                // Get the shared secret needed to use the bridge.
-                exec.init();
+exports.reset();
 
-                // TODO: Extract this as a proper plugin.
-                modulemapper.clobbers('cordova/plugin/android/app', 'navigator.app');
 
-                var APP_PLUGIN_NAME = Number(cordova.platformVersion.split('.')[0]) >= 4 ? 'CoreAndroid' : 'App';
+});
 
-                // Inject a listener for the backbutton on the document.
-                var backButtonChannel = cordova.addDocumentEventHandler('backbutton');
-                backButtonChannel.onHasSubscribersChange = function () {
-                    // If we just attached the first handler or detached the last handler,
-                    // let native know we need to override the back button.
-                    exec(null, null, APP_PLUGIN_NAME, 'overrideBackbutton', [this.numHandlers === 1]);
-                };
+// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/platform.js
+define("cordova/platform", function(require, exports, module) {
 
-                // Add hardware MENU and SEARCH button handlers
-                cordova.addDocumentEventHandler('menubutton');
-                cordova.addDocumentEventHandler('searchbutton');
+// The last resume event that was received that had the result of a plugin call.
+var lastResumeEvent = null;
 
-                function bindButtonChannel (buttonName) {
-                    // generic button bind used for volumeup/volumedown buttons
-                    var volumeButtonChannel = cordova.addDocumentEventHandler(buttonName + 'button');
-                    volumeButtonChannel.onHasSubscribersChange = function () {
-                        exec(null, null, APP_PLUGIN_NAME, 'overrideButton', [buttonName, this.numHandlers === 1]);
-                    };
-                }
-                // Inject a listener for the volume buttons on the document.
-                bindButtonChannel('volumeup');
-                bindButtonChannel('volumedown');
+module.exports = {
+    id: 'android',
+    bootstrap: function() {
+        var channel = require('cordova/channel'),
+            cordova = require('cordova'),
+            exec = require('cordova/exec'),
+            modulemapper = require('cordova/modulemapper');
 
-                // The resume event is not "sticky", but it is possible that the event
-                // will contain the result of a plugin call. We need to ensure that the
-                // plugin result is delivered even after the event is fired (CB-10498)
-                var cordovaAddEventListener = document.addEventListener;
+        // Get the shared secret needed to use the bridge.
+        exec.init();
 
-                document.addEventListener = function (evt, handler, capture) {
-                    cordovaAddEventListener(evt, handler, capture);
+        // TODO: Extract this as a proper plugin.
+        modulemapper.clobbers('cordova/plugin/android/app', 'navigator.app');
 
-                    if (evt === 'resume' && lastResumeEvent) {
-                        handler(lastResumeEvent);
-                    }
-                };
+        var APP_PLUGIN_NAME = Number(cordova.platformVersion.split('.')[0]) >= 4 ? 'CoreAndroid' : 'App';
 
-                // Let native code know we are all done on the JS side.
-                // Native code will then un-hide the WebView.
-                channel.onCordovaReady.subscribe(function () {
-                    exec(onMessageFromNative, null, APP_PLUGIN_NAME, 'messageChannel', []);
-                    exec(null, null, APP_PLUGIN_NAME, 'show', []);
-                });
-            }
+        // Inject a listener for the backbutton on the document.
+        var backButtonChannel = cordova.addDocumentEventHandler('backbutton');
+        backButtonChannel.onHasSubscribersChange = function() {
+            // If we just attached the first handler or detached the last handler,
+            // let native know we need to override the back button.
+            exec(null, null, APP_PLUGIN_NAME, "overrideBackbutton", [this.numHandlers == 1]);
         };
 
-        function onMessageFromNative (msg) {
-            var cordova = require('cordova');
-            var action = msg.action;
-
-            switch (action) {
-            // Button events
-            case 'backbutton':
-            case 'menubutton':
-            case 'searchbutton':
-            // App life cycle events
-                break;
-            case 'pause':
-                break;
-            // Volume events
-            case 'volumedownbutton':
-            case 'volumeupbutton':
-                cordova.fireDocumentEvent(action);
-                break;
-            case 'resume':
-                if (arguments.length > 1 && msg.pendingResult) {
-                    if (arguments.length === 2) {
-                        msg.pendingResult.result = arguments[1];
-                    } else {
-                        // The plugin returned a multipart message
-                        var res = [];
-                        for (var i = 1; i < arguments.length; i++) {
-                            res.push(arguments[i]);
-                        }
-                        msg.pendingResult.result = res;
-                    }
+        // Add hardware MENU and SEARCH button handlers
+        cordova.addDocumentEventHandler('menubutton');
+        cordova.addDocumentEventHandler('searchbutton');
 
-                    // Save the plugin result so that it can be delivered to the js
-                    // even if they miss the initial firing of the event
-                    lastResumeEvent = msg;
-                }
-                cordova.fireDocumentEvent(action, msg);
-                break;
-            default:
-                throw new Error('Unknown event action ' + action);
-            }
+        function bindButtonChannel(buttonName) {
+            // generic button bind used for volumeup/volumedown buttons
+            var volumeButtonChannel = cordova.addDocumentEventHandler(buttonName + 'button');
+            volumeButtonChannel.onHasSubscribersChange = function() {
+                exec(null, null, APP_PLUGIN_NAME, "overrideButton", [buttonName, this.numHandlers == 1]);
+            };
         }
+        // Inject a listener for the volume buttons on the document.
+        bindButtonChannel('volumeup');
+        bindButtonChannel('volumedown');
 
-    });
+        // The resume event is not "sticky", but it is possible that the event
+        // will contain the result of a plugin call. We need to ensure that the
+        // plugin result is delivered even after the event is fired (CB-10498)
+        var cordovaAddEventListener = document.addEventListener;
+
+        document.addEventListener = function(evt, handler, capture) {
+            cordovaAddEventListener(evt, handler, capture);
 
-    // file: /Users/maj/src/cordova-android/cordova-js-src/plugin/android/app.js
-    define('cordova/plugin/android/app', function (require, exports, module) {
-
-        var exec = require('cordova/exec');
-        var APP_PLUGIN_NAME = Number(require('cordova').platformVersion.split('.')[0]) >= 4 ? 'CoreAndroid' : 'App';
-
-        module.exports = {
-            /**
-            * Clear the resource cache.
-            */
-            clearCache: function () {
-                exec(null, null, APP_PLUGIN_NAME, 'clearCache', []);
-            },
-
-            /**
-            * Load the url into the webview or into new browser instance.
-            *
-            * @param url           The URL to load
-            * @param props         Properties that can be passed in to the activity:
-            *      wait: int                           => wait msec before loading URL
-            *      loadingDialog: "Title,Message"      => display a native loading dialog
-            *      loadUrlTimeoutValue: int            => time in msec to wait before triggering a timeout error
-            *      clearHistory: boolean              => clear webview history (default=false)
-            *      openExternal: boolean              => open in a new browser (default=false)
-            *
-            * Example:
-            *      navigator.app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000});
-            */
-            loadUrl: function (url, props) {
-                exec(null, null, APP_PLUGIN_NAME, 'loadUrl', [url, props]);
-            },
-
-            /**
-            * Cancel loadUrl that is waiting to be loaded.
-            */
-            cancelLoadUrl: function () {
-                exec(null, null, APP_PLUGIN_NAME, 'cancelLoadUrl', []);
-            },
-
-            /**
-            * Clear web history in this web view.
-            * Instead of BACK button loading the previous web page, it will exit the app.
-            */
-            clearHistory: function () {
-                exec(null, null, APP_PLUGIN_NAME, 'clearHistory', []);
-            },
-
-            /**
-            * Go to previous page displayed.
-            * This is the same as pressing the backbutton on Android device.
-            */
-            backHistory: function () {
-                exec(null, null, APP_PLUGIN_NAME, 'backHistory', []);
-            },
-
-            /**
-            * Override the default behavior of the Android back button.
-            * If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
-            *
-            * Note: The user should not have to call this method.  Instead, when the user
-            *       registers for the "backbutton" event, this is automatically done.
-            *
-            * @param override        T=override, F=cancel override
-            */
-            overrideBackbutton: function (override) {
-                exec(null, null, APP_PLUGIN_NAME, 'overrideBackbutton', [override]);
-            },
-
-            /**
-            * Override the default behavior of the Android volume button.
-            * If overridden, when the volume button is pressed, the "volume[up|down]button"
-            * JavaScript event will be fired.
-            *
-            * Note: The user should not have to call this method.  Instead, when the user
-            *       registers for the "volume[up|down]button" event, this is automatically done.
-            *
-            * @param button          volumeup, volumedown
-            * @param override        T=override, F=cancel override
-            */
-            overrideButton: function (button, override) {
-                exec(null, null, APP_PLUGIN_NAME, 'overrideButton', [button, override]);
-            },
-
-            /**
-            * Exit and terminate the application.
-            */
-            exitApp: function () {
-                return exec(null, null, APP_PLUGIN_NAME, 'exitApp', []);
+            if (evt === 'resume' && lastResumeEvent) {
+                handler(lastResumeEvent);
             }
         };
 
-    });
-
-    // file: src/common/pluginloader.js
-    define('cordova/pluginloader', function (require, exports, module) {
-
-        var modulemapper = require('cordova/modulemapper');
-
-        // Helper function to inject a <script> tag.
-        // Exported for testing.
-        exports.injectScript = function (url, onload, onerror) {
-            var script = document.createElement('script');
-            // onload fires even when script fails loads with an error.
-            script.onload = onload;
-            // onerror fires for malformed URLs.
-            script.onerror = onerror;
-            script.src = url;
-            document.head.appendChild(script);
-        };
+        // Let native code know we are all done on the JS side.
+        // Native code will then un-hide the WebView.
+        channel.onCordovaReady.subscribe(function() {
+            exec(onMessageFromNative, null, APP_PLUGIN_NAME, 'messageChannel', []);
+            exec(null, null, APP_PLUGIN_NAME, "show", []);
+        });
+    }
+};
+
+function onMessageFromNative(msg) {
+    var cordova = require('cordova');
+    var action = msg.action;
+
+    switch (action)
+    {
+        // Button events
+        case 'backbutton':
+        case 'menubutton':
+        case 'searchbutton':
+        // App life cycle events
+        case 'pause':
+        // Volume events
+        case 'volumedownbutton':
+        case 'volumeupbutton':
+            cordova.fireDocumentEvent(action);
+            break;
+        case 'resume':
+            if(arguments.length > 1 && msg.pendingResult) {
+                if(arguments.length === 2) {
+                    msg.pendingResult.result = arguments[1];
+                } else {
+                    // The plugin returned a multipart message
+                    var res = [];
+                    for(var i = 1; i < arguments.length; i++) {
+                        res.push(arguments[i]);
+                    }
+                    msg.pendingResult.result = res;
+                }
 
-        function injectIfNecessary (id, url, onload, onerror) {
-            onerror = onerror || onload;
+                // Save the plugin result so that it can be delivered to the js
+                // even if they miss the initial firing of the event
+                lastResumeEvent = msg;
+            }
+            cordova.fireDocumentEvent(action, msg);
+            break;
+        default:
+            throw new Error('Unknown event action ' + action);
+    }
+}
+
+});
+
+// file: /Users/jbowser/cordova/cordova-android/cordova-js-src/plugin/android/app.js
+define("cordova/plugin/android/app", function(require, exports, module) {
+
+var exec = require('cordova/exec');
+var APP_PLUGIN_NAME = Number(require('cordova').platformVersion.split('.')[0]) >= 4 ? 'CoreAndroid' : 'App';
+
+module.exports = {
+    /**
+    * Clear the resource cache.
+    */
+    clearCache:function() {
+        exec(null, null, APP_PLUGIN_NAME, "clearCache", []);
+    },
+
+    /**
+    * Load the url into the webview or into new browser instance.
+    *
+    * @param url           The URL to load
+    * @param props         Properties that can be passed in to the activity:
+    *      wait: int                           => wait msec before loading URL
+    *      loadingDialog: "Title,Message"      => display a native loading dialog
+    *      loadUrlTimeoutValue: int            => time in msec to wait before triggering a timeout error
+    *      clearHistory: boolean              => clear webview history (default=false)
+    *      openExternal: boolean              => open in a new browser (default=false)
+    *
+    * Example:
+    *      navigator.app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000});
+    */
+    loadUrl:function(url, props) {
+        exec(null, null, APP_PLUGIN_NAME, "loadUrl", [url, props]);
+    },
+
+    /**
+    * Cancel loadUrl that is waiting to be loaded.
+    */
+    cancelLoadUrl:function() {
+        exec(null, null, APP_PLUGIN_NAME, "cancelLoadUrl", []);
+    },
+
+    /**
+    * Clear web history in this web view.
+    * Instead of BACK button loading the previous web page, it will exit the app.
+    */
+    clearHistory:function() {
+        exec(null, null, APP_PLUGIN_NAME, "clearHistory", []);
+    },
+
+    /**
+    * Go to previous page displayed.
+    * This is the same as pressing the backbutton on Android device.
+    */
+    backHistory:function() {
+        exec(null, null, APP_PLUGIN_NAME, "backHistory", []);
+    },
+
+    /**
+    * Override the default behavior of the Android back button.
+    * If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
+    *
+    * Note: The user should not have to call this method.  Instead, when the user
+    *       registers for the "backbutton" event, this is automatically done.
+    *
+    * @param override        T=override, F=cancel override
+    */
+    overrideBackbutton:function(override) {
+        exec(null, null, APP_PLUGIN_NAME, "overrideBackbutton", [override]);
+    },
+
+    /**
+    * Override the default behavior of the Android volume button.
+    * If overridden, when the volume button is pressed, the "volume[up|down]button"
+    * JavaScript event will be fired.
+    *
+    * Note: The user should not have to call this method.  Instead, when the user
+    *       registers for the "volume[up|down]button" event, this is automatically done.
+    *
+    * @param button          volumeup, volumedown
+    * @param override        T=override, F=cancel override
+    */
+    overrideButton:function(button, override) {
+        exec(null, null, APP_PLUGIN_NAME, "overrideButton", [button, override]);
+    },
+
+    /**
+    * Exit and terminate the application.
+    */
+    exitApp:function() {
+        return exec(null, null, APP_PLUGIN_NAME, "exitApp", []);
+    }
+};
+
+});
+
+// file: src/common/pluginloader.js
+define("cordova/pluginloader", function(require, exports, module) {
+
+var modulemapper = require('cordova/modulemapper');
+var urlutil = require('cordova/urlutil');
+
+// Helper function to inject a <script> tag.
+// Exported for testing.
+exports.injectScript = function(url, onload, onerror) {
+    var script = document.createElement("script");
+    // onload fires even when script fails loads with an error.
+    script.onload = onload;
+    // onerror fires for malformed URLs.
+    script.onerror = onerror;
+    script.src = url;
+    document.head.appendChild(script);
+};
+
+function injectIfNecessary(id, url, onload, onerror) {
+    onerror = onerror || onload;
+    if (id in define.moduleMap) {
+        onload();
+    } else {
+        exports.injectScript(url, function() {
             if (id in define.moduleMap) {
                 onload();
             } else {
-                exports.injectScript(url, function () {
-                    if (id in define.moduleMap) {
-                        onload();
-                    } else {
-                        onerror();
-                    }
-                }, onerror);
+                onerror();
             }
-        }
-
-        function onScriptLoadingComplete (moduleList, finishPluginLoading) {
-            // Loop through all the plugins and then through their clobbers and merges.
-            for (var i = 0, module; module = moduleList[i]; i++) {
-                if (module.clobbers && module.clobbers.length) {
-                    for (var j = 0; j < module.clobbers.length; j++) {
-                        modulemapper.clobbers(module.id, module.clobbers[j]);
-                    }
-                }
-
-                if (module.merges && module.merges.length) {
-                    for (var k = 0; k < module.merges.length; k++) {
-                        modulemapper.merges(module.id, module.merges[k]);
-                    }
-                }
+        }, onerror);
+    }
+}
 
-                // Finally, if runs is truthy we want to simply require() the module.
-                if (module.runs) {
-                    modulemapper.runs(module.id);
-                }
+function onScriptLoadingComplete(moduleList, finishPluginLoading) {
+    // Loop through all the plugins and then through their clobbers and merges.
+    for (var i = 0, module; module = moduleList[i]; i++) {
+        if (module.clobbers && module.clobbers.length) {
+            for (var j = 0; j < module.clobbers.length; j++) {
+                modulemapper.clobbers(module.id, module.clobbers[j]);
             }
-
-            finishPluginLoading();
         }
 
-        // Handler for the cordova_plugins.js content.
-        // See plugman's plugin_loader.js for the details of this object.
-        // This function is only called if the really is a plugins array that isn't empty.
-        // Otherwise the onerror response handler will just call finishPluginLoading().
-        function handlePluginsObject (path, moduleList, finishPluginLoading) {
-            // Now inject the scripts.
-            var scriptCounter = moduleList.length;
-
-            if (!scriptCounter) {
-                finishPluginLoading();
-                return;
-            }
-            function scriptLoadedCallback () {
-                if (!--scriptCounter) {
-                    onScriptLoadingComplete(moduleList, finishPluginLoading);
-                }
-            }
-
-            for (var i = 0; i < moduleList.length; i++) {
-                injectIfNecessary(moduleList[i].id, path + moduleList[i].file, scriptLoadedCallback);
+        if (module.merges && module.merges.length) {
+            for (var k = 0; k < module.merges.length; k++) {
+                modulemapper.merges(module.id, module.merges[k]);
             }
         }
 
-        function findCordovaPath () {
-            var path = null;
-            var scripts = document.getElementsByTagName('script');
-            var term = '/cordova.js';
-            for (var n = scripts.length - 1; n > -1; n--) {
-                var src = scripts[n].src.replace(/\?.*$/, ''); // Strip any query param (CB-6007).
-                if (src.indexOf(term) === (src.length - term.length)) {
-                    path = src.substring(0, src.length - term.length) + '/';
-                    break;
-                }
-            }
-            return path;
+        // Finally, if runs is truthy we want to simply require() the module.
+        if (module.runs) {
+            modulemapper.runs(module.id);
         }
+    }
 
-        // Tries to load all plugins' js-modules.
-        // This is an async process, but onDeviceReady is blocked on onPluginsReady.
-        // onPluginsReady is fired when there are no plugins to load, or they are all done.
-        exports.load = function (callback) {
-            var pathPrefix = findCordovaPath();
-            if (pathPrefix === null) {
-                console.log('Could not find cordova.js script tag. Plugin loading may fail.');
-                pathPrefix = '';
-            }
-            injectIfNecessary('cordova/plugin_list', pathPrefix + 'cordova_plugins.js', function () {
-                var moduleList = require('cordova/plugin_list');
-                handlePluginsObject(pathPrefix, moduleList, callback);
-            }, callback);
-        };
+    finishPluginLoading();
+}
 
-    });
+// Handler for the cordova_plugins.js content.
+// See plugman's plugin_loader.js for the details of this object.
+// This function is only called if the really is a plugins array that isn't empty.
+// Otherwise the onerror response handler will just call finishPluginLoading().
+function handlePluginsObject(path, moduleList, finishPluginLoading) {
+    // Now inject the scripts.
+    var scriptCounter = moduleList.length;
+
+    if (!scriptCounter) {
+        finishPluginLoading();
+        return;
+    }
+    function scriptLoadedCallback() {
+        if (!--scriptCounter) {
+            onScriptLoadingComplete(moduleList, finishPluginLoading);
+        }
+    }
 
-    // file: src/common/pluginloader_b.js
-    define('cordova/pluginloader_b', function (require, exports, module) {
+    for (var i = 0; i < moduleList.length; i++) {
+        injectIfNecessary(moduleList[i].id, path + moduleList[i].file, scriptLoadedCallback);
+    }
+}
+
+function findCordovaPath() {
+    var path = null;
+    var scripts = document.getElementsByTagName('script');
+    var term = '/cordova.js';
+    for (var n = scripts.length-1; n>-1; n--) {
+        var src = scripts[n].src.replace(/\?.*$/, ''); // Strip any query param (CB-6007).
+        if (src.indexOf(term) == (src.length - term.length)) {
+            path = src.substring(0, src.length - term.length) + '/';
+            break;
+        }
+    }
+    return path;
+}
+
+// Tries to load all plugins' js-modules.
+// This is an async process, but onDeviceReady is blocked on onPluginsReady.
+// onPluginsReady is fired when there are no plugins to load, or they are all done.
+exports.load = function(callback) {
+    var pathPrefix = findCordovaPath();
+    if (pathPrefix === null) {
+        console.log('Could not find cordova.js script tag. Plugin loading may fail.');
+        pathPrefix = '';
+    }
+    injectIfNecessary('cordova/plugin_list', pathPrefix + 'cordova_plugins.js', function() {
+        var moduleList = require("cordova/plugin_list");
+        handlePluginsObject(pathPrefix, moduleList, callback);
+    }, callback);
+};
 
-        var modulemapper = require('cordova/modulemapper');
 
-        // Handler for the cordova_plugins.js content.
-        // See plugman's plugin_loader.js for the details of this object.
-        function handlePluginsObject (moduleList) {
-            // if moduleList is not defined or empty, we've nothing to do
-            if (!moduleList || !moduleList.length) {
-                return;
-            }
+});
 
-            // Loop through all the modules and then through their clobbers and merges.
-            for (var i = 0, module; module = moduleList[i]; i++) {
-                if (module.clobbers && module.clobbers.length) {
-                    for (var j = 0; j < module.clobbers.length; j++) {
-                        modulemapper.clobbers(module.id, module.clobbers[j]);
-                    }
-                }
+// file: src/common/pluginloader_b.js
+define("cordova/pluginloader_b", function(require, exports, module) {
 
-                if (module.merges && module.merges.length) {
-                    for (var k = 0; k < module.merges.length; k++) {
-                        modulemapper.merges(module.id, module.merges[k]);
-                    }
-                }
+var modulemapper = require('cordova/modulemapper');
 
-                // Finally, if runs is truthy we want to simply require() the module.
-                if (module.runs) {
-                    modulemapper.runs(module.id);
-                }
+// Handler for the cordova_plugins.js content.
+// See plugman's plugin_loader.js for the details of this object.
+function handlePluginsObject(moduleList) {
+    // if moduleList is not defined or empty, we've nothing to do
+    if (!moduleList || !moduleList.length) {
+        return;
+    }
+
+    // Loop through all the modules and then through their clobbers and merges.
+    for (var i = 0, module; module = moduleList[i]; i++) {
+        if (module.clobbers && module.clobbers.length) {
+            for (var j = 0; j < module.clobbers.length; j++) {
+                modulemapper.clobbers(module.id, module.clobbers[j]);
             }
         }
 
-        // Loads all plugins' js-modules. Plugin loading is syncronous in browserified bundle
-        // but the method accepts callback to be compatible with non-browserify flow.
-        // onDeviceReady is blocked on onPluginsReady. onPluginsReady is fired when there are
-        // no plugins to load, or they are all done.
-        exports.load = function (callback) {
-            var moduleList = require('cordova/plugin_list');
-            handlePluginsObject(moduleList);
-
-            callback();
-        };
+        if (module.merges && module.merges.length) {
+            for (var k = 0; k < module.merges.length; k++) {
+                modulemapper.merges(module.id, module.merges[k]);
+            }
+        }
 
-    });
+        // Finally, if runs is truthy we want to simply require() the module.
+        if (module.runs) {
+            modulemapper.runs(module.id);
+        }
+    }
+}
 
-    // file: src/common/urlutil.js
-    define('cordova/urlutil', function (require, exports, module) {
+// Loads all plugins' js-modules. Plugin loading is syncronous in browserified bundle
+// but the method accepts callback to be compatible with non-browserify flow.
+// onDeviceReady is blocked on onPluginsReady. onPluginsReady is fired when there are
+// no plugins to load, or they are all done.
+exports.load = function(callback) {
+    var moduleList = require("cordova/plugin_list");
+    handlePluginsObject(moduleList);
 
-        /**
-         * For already absolute URLs, returns what is passed in.
-         * For relative URLs, converts them to absolute ones.
-         */
-        exports.makeAbsolute = function makeAbsolute (url) {
-            var anchorEl = document.createElement('a');
-            anchorEl.href = url;
-            return anchorEl.href;
-        };
+    callback();
+};
 
-    });
 
-    // file: src/common/utils.js
-    define('cordova/utils', function (require, exports, module) {
+});
 
-        var utils = exports;
+// file: src/common/urlutil.js
+define("cordova/urlutil", function(require, exports, module) {
 
-        /**
-         * Defines a property getter / setter for obj[key].
-         */
-        utils.defineGetterSetter = function (obj, key, getFunc, opt_setFunc) {
-            if (Object.defineProperty) {
-                var desc = {
-                    get: getFunc,
-                    configurable: true
-                };
-                if (opt_setFunc) {
-                    desc.set = opt_setFunc;
-                }
-                Object.defineProperty(obj, key, desc);
-            } else {
-                obj.__defineGetter__(key, getFunc);
-                if (opt_setFunc) {
-                    obj.__defineSetter__(key, opt_setFunc);
-                }
-            }
-        };
 
-        /**
-         * Defines a property getter for obj[key].
-         */
-        utils.defineGetter = utils.defineGetterSetter;
+/**
+ * For already absolute URLs, returns what is passed in.
+ * For relative URLs, converts them to absolute ones.
+ */
+exports.makeAbsolute = function makeAbsolute(url) {
+    var anchorEl = document.createElement('a');
+    anchorEl.href = url;
+    return anchorEl.href;
+};
 
-        utils.arrayIndexOf = function (a, item) {
-            if (a.indexOf) {
-                return a.indexOf(item);
-            }
-            var len = a.length;
-            for (var i = 0; i < len; ++i) {
-                if (a[i] === item) {
-                    return i;
-                }
-            }
-            return -1;
-        };
 
-        /**
-         * Returns whether the item was found in the array.
-         */
-        utils.arrayRemove = function (a, item) {
-            var index = utils.arrayIndexOf(a, item);
-            if (index !== -1) {
-                a.splice(index, 1);
-            }
-            return index !== -1;
-        };
+});
 
-        utils.typeName = function (val) {
-            return Object.prototype.toString.call(val).slice(8, -1);
-        };
+// file: src/common/utils.js
+define("cordova/utils", function(require, exports, module) {
 
-        /**
-         * Returns an indication of whether the argument is an array or not
-         */
-        utils.isArray = Array.isArray ||
-                function (a) { return utils.typeName(a) === 'Array'; };
+var utils = exports;
 
-        /**
-         * Returns an indication of whether the argument is a Date or not
-         */
-        utils.isDate = function (d) {
-            return (d instanceof Date);
+/**
+ * Defines a property getter / setter for obj[key].
+ */
+utils.defineGetterSetter = function(obj, key, getFunc, opt_setFunc) {
+    if (Object.defineProperty) {
+        var desc = {
+            get: getFunc,
+            configurable: true
         };
+        if (opt_setFunc) {
+            desc.set = opt_setFunc;
+        }
+        Object.defineProperty(obj, key, desc);
+    } else {
+        obj.__defineGetter__(key, getFunc);
+        if (opt_setFunc) {
+            obj.__defineSetter__(key, opt_setFunc);
+        }
+    }
+};
 
-        /**
-         * Does a deep clone of the object.
-         */
-        utils.clone = function (obj) {
-            if (!obj || typeof obj === 'function' || utils.isDate(obj) || typeof obj !== 'object') {
-                return obj;
-            }
-
-            var retVal, i;
-
-            if (utils.isArray(obj)) {
-                retVal = [];
-                for (i = 0; i < obj.length; ++i) {
-                    retVal.push(utils.clone(obj[i]));
-                }
-                return retVal;
-            }
+/**
+ * Defines a property getter for obj[key].
+ */
+utils.defineGetter = utils.defineGetterSetter;
 
-            retVal = {};
-            for (i in obj) {
-                // https://issues.apache.org/jira/browse/CB-11522 'unknown' type may be returned in
-                // custom protocol activation case on Windows Phone 8.1 causing "No such interface supported" exception
-                // on cloning.
-                if ((!(i in retVal) || retVal[i] !== obj[i]) && typeof obj[i] !== 'undefined' && typeof obj[i] !== 'unknown') {
-                    retVal[i] = utils.clone(obj[i]);
-                }
-            }
-            return retVal;
-        };
+utils.arrayIndexOf = function(a, item) {
+    if (a.indexOf) {
+        return a.indexOf(item);
+    }
+    var len = a.length;
+    for (var i = 0; i < len; ++i) {
+        if (a[i] == item) {
+            return i;
+        }
+    }
+    return -1;
+};
+
+/**
+ * Returns whether the item was found in the array.
+ */
+utils.arrayRemove = function(a, item) {
+    var index = utils.arrayIndexOf(a, item);
+    if (index != -1) {
+        a.splice(index, 1);
+    }
+    return index != -1;
+};
+
+utils.typeName = function(val) {
+    return Object.prototype.toString.call(val).slice(8, -1);
+};
+
+/**
+ * Returns an indication of whether the argument is an array or not
+ */
+utils.isArray = Array.isArray ||
+                function(a) {return utils.typeName(a) == 'Array';};
+
+/**
+ * Returns an indication of whether the argument is a Date or not
+ */
+utils.isDate = function(d) {
+    return (d instanceof Date);
+};
+
+/**
+ * Does a deep clone of the object.
+ */
+utils.clone = function(obj) {
+    if(!obj || typeof obj == 'function' || utils.isDate(obj) || typeof obj != 'object') {
+        return obj;
+    }
 
-        /**
-         * Returns a wrapped version of the function
-         */
-        utils.close = function (context, func, params) {
-            return function () {
-                var args = params || arguments;
-                return func.apply(context, args);
-            };
-        };
+    var retVal, i;
 
-        // ------------------------------------------------------------------------------
-        function UUIDcreatePart (length) {
-            var uuidpart = '';
-            for (var i = 0; i < length; i++) {
-                var uuidchar = parseInt((Math.random() * 256), 10).toString(16);
-                if (uuidchar.length === 1) {
-                    uuidchar = '0' + uuidchar;
-                }
-                uuidpart += uuidchar;
-            }
-            return uuidpart;
+    if(utils.isArray(obj)){
+        retVal = [];
+        for(i = 0; i < obj.length; ++i){
+            retVal.push(utils.clone(obj[i]));
         }
+        return retVal;
+    }
 
-        /**
-         * Create a UUID
-         */
-        utils.createUUID = function () {
-            return UUIDcreatePart(4) + '-' +
+    retVal = {};
+    for(i in obj){
+        // https://issues.apache.org/jira/browse/CB-11522 'unknown' type may be returned in
+        // custom protocol activation case on Windows Phone 8.1 causing "No such interface supported" exception
+        // on cloning.
+        if((!(i in retVal) || retVal[i] != obj[i]) && typeof obj[i] != 'undefined' && typeof obj[i] != 'unknown') {
+            retVal[i] = utils.clone(obj[i]);
+        }
+    }
+    return retVal;
+};
+
+/**
+ * Returns a wrapped version of the function
+ */
+utils.close = function(context, func, params) {
+    return function() {
+        var args = params || arguments;
+        return func.apply(context, args);
+    };
+};
+
+//------------------------------------------------------------------------------
+function UUIDcreatePart(length) {
+    var uuidpart = "";
+    for (var i=0; i<length; i++) {
+        var uuidchar = parseInt((Math.random() * 256), 10).toString(16);
+        if (uuidchar.length == 1) {
+            uuidchar = "0" + uuidchar;
+        }
+        uuidpart += uuidchar;
+    }
+    return uuidpart;
+}
+
+/**
+ * Create a UUID
+ */
+utils.createUUID = function() {
+    return UUIDcreatePart(4) + '-' +
         UUIDcreatePart(2) + '-' +
         UUIDcreatePart(2) + '-' +
         UUIDcreatePart(2) + '-' +
         UUIDcreatePart(6);
-        };
+};
+
+
+/**
+ * Extends a child object from a parent object using classical inheritance
+ * pattern.
+ */
+utils.extend = (function() {
+    // proxy used to establish prototype chain
+    var F = function() {};
+    // extend Child from Parent
+    return function(Child, Parent) {
+
+        F.prototype = Parent.prototype;
+        Child.prototype = new F();
+        Child.__super__ = Parent.prototype;
+        Child.prototype.constructor = Child;
+    };
+}());
+
+/**
+ * Alerts a message in any available way: alert or console.log.
+ */
+utils.alert = function(msg) {
+    if (window.alert) {
+        window.alert(msg);
+    } else if (console && console.log) {
+        console.log(msg);
+    }
+};
 
-        /**
-         * Extends a child object from a parent object using classical inheritance
-         * pattern.
-         */
-        utils.extend = (function () {
-            // proxy used to establish prototype chain
-            var F = function () {};
-            // extend Child from Parent
-            return function (Child, Parent) {
-
-                F.prototype = Parent.prototype;
-                Child.prototype = new F();
-                Child.__super__ = Parent.prototype;
-                Child.prototype.constructor = Child;
-            };
-        }());
 
-        /**
-         * Alerts a message in any available way: alert or console.log.
-         */
-        utils.alert = function (msg) {
-            if (window.alert) {
-                window.alert(msg);
-            } else if (console && console.log) {
-                console.log(msg);
-            }
-        };
 
-    });
 
-    window.cordova = require('cordova');
-    // file: src/scripts/bootstrap.js
 
-    require('cordova/init');
+});
 
-})();
+window.cordova = require('cordova');
+// file: src/scripts/bootstrap.js
+
+require('cordova/init');
+
+})();
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-android] 02/04: CB-13323 Updated RELEASENOTES and Version for release 6.3.0

Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git

commit 7203b740fd7a149a3bfc287ff651d34f7cfdb79d
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Mon Sep 25 11:35:59 2017 -0700

    CB-13323 Updated RELEASENOTES and Version for release 6.3.0
---
 RELEASENOTES.md        | 17 +++++++++++++++++
 framework/build.gradle |  2 +-
 package.json           |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f35713b..5707ac3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,23 @@
 -->
 ## Release Notes for Cordova (Android) ##
 
+### 6.3.0 (Sep 25, 2017)
+* [CB-6936](https://issues.apache.org/jira/browse/CB-6936) fix crash when calling methods on a destroyed webview
+* [CB-12981](https://issues.apache.org/jira/browse/CB-12981) handle SDK 26.0.2 slightly different AVD list output for **Android** 8+ AVDs. Would cause "cannot read property replace of undefined" errors when trying to deploy an **Android** 8 emulator.
+* Updated maven repo to include most recent lib versions
+* [CB-13177](https://issues.apache.org/jira/browse/CB-13177) Updating to API Level 26
+* Revert [CB-12015](https://issues.apache.org/jira/browse/CB-12015) initial-scale values less than 1.0 are ignored on **Android**
+* [CB-12730](https://issues.apache.org/jira/browse/CB-12730) The Cordova Compatibility Plugin is now integrated into cordova-android
+* [CB-12453](https://issues.apache.org/jira/browse/CB-12453) Remove unnecessary double quotes from .bat files which are the causes of crash if project path contains spaces
+* [CB-13031](https://issues.apache.org/jira/browse/CB-13031) Fix bug with case-sensitivity of **Android**-packageName
+* [CB-10916](https://issues.apache.org/jira/browse/CB-10916) Support display name for **Android**
+* [CB-12423](https://issues.apache.org/jira/browse/CB-12423) make explicit JDK 1.8 or greater is needed in the `README`, we require 1.8 for compilation, but do not have 1.8 Java features yet
+* [CB-13006](https://issues.apache.org/jira/browse/CB-13006) removed create and update end-to-end tests, and instead added more unit test coverage. tweaked code coverage invocation so that we get coverage details on the create.js module. slight changes to the create.js module so that it is slightly easier to test.
+* [CB-12950](https://issues.apache.org/jira/browse/CB-12950) lots of tweaks for end-to-end test runs, especially on CI: - rename npm tasks to reflect what they do (npm run unit-tests, npm run e2e-tests). main `npm test` runs linter, unit tests and e2e tests now. - locked jasmine down to ~2.6.0. - consolidate gitignores. - updated travis to run `npm test`. add **Android** sdk installation to appveyor ci run.align **Android** dpendencies across travis and appveyor. have appveyor install gr [...]
+* [CB-12605](https://issues.apache.org/jira/browse/CB-12605) In **Windows** get **Android** studio path from the registry
+* [CB-12762](https://issues.apache.org/jira/browse/CB-12762) : pointed `package.json` repo items to github mirrors instead of apache repos site
+* [CB-12617](https://issues.apache.org/jira/browse/CB-12617) : removed node0.x support for platforms and added engineStrict
+
 ### 6.2.3 (May 2, 2017)
 * [CB-12640](https://issues.apache.org/jira/browse/CB-12640) better handling of unrecognized Android SDK commands on **Windows**.
 * [CB-12640](https://issues.apache.org/jira/browse/CB-12640) flipped avd parsing logic so that it always tries to use avdmanager to retrieve avds first, then falls back to android command if avdmanager cannot be found (and errors with ENOENT). updated tests - and added explicit tests to ensure to shell out to singular forms of sub-commands when executing `android`
diff --git a/framework/build.gradle b/framework/build.gradle
index 9e4517b..6f10564 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 group = 'org.apache.cordova'
-version = '6.3.0-dev'
+version = '6.3.0'
 
 android {
     compileSdkVersion cdvCompileSdkVersion
diff --git a/package.json b/package.json
index cf06c5b..32acea7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-android",
-  "version": "6.3.0-dev",
+  "version": "6.3.0",
   "description": "cordova-android release",
   "bin": {
     "create": "bin/create"

-- 
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-android] 01/04: CB-13323 Updated checked-in node_modules

Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git

commit 97aab900dab03703c612634446dd489461bd668b
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Mon Sep 25 11:17:24 2017 -0700

    CB-13323 Updated checked-in node_modules
---
 node_modules/abbrev/package.json                  |   9 +-
 node_modules/android-versions/.jshintignore       |   8 ++
 node_modules/android-versions/.jshintrc           |  28 ++++
 node_modules/android-versions/.travis.yml         |   3 +
 node_modules/android-versions/README.md           |  87 ++++++++++++
 node_modules/android-versions/index.js            | 153 ++++++++++++++++++++++
 node_modules/android-versions/package.json        | 103 +++++++++++++++
 node_modules/ansi/package.json                    |   9 +-
 node_modules/balanced-match/package.json          |   7 +-
 node_modules/base64-js/package.json               |   9 +-
 node_modules/big-integer/BigInteger.js            |   2 +
 node_modules/big-integer/BigInteger.min.js        |   2 +-
 node_modules/big-integer/package.json             |  23 ++--
 node_modules/bplist-parser/package.json           |   9 +-
 node_modules/brace-expansion/package.json         |   7 +-
 node_modules/concat-map/package.json              |  11 +-
 node_modules/cordova-common/package.json          |   7 +-
 node_modules/cordova-registry-mapper/package.json |   9 +-
 node_modules/elementtree/package.json             |   9 +-
 node_modules/glob/package.json                    |   9 +-
 node_modules/inflight/package.json                |   9 +-
 node_modules/inherits/package.json                |   9 +-
 node_modules/lodash/package.json                  |   9 +-
 node_modules/minimatch/package.json               |   7 +-
 node_modules/nopt/package.json                    |   9 +-
 node_modules/once/package.json                    |   9 +-
 node_modules/os-homedir/package.json              |   9 +-
 node_modules/os-tmpdir/package.json               |   9 +-
 node_modules/osenv/package.json                   |   9 +-
 node_modules/path-is-absolute/package.json        |   9 +-
 node_modules/plist/package.json                   |   9 +-
 node_modules/properties-parser/package.json       |  16 +--
 node_modules/q/package.json                       |   9 +-
 node_modules/sax/package.json                     |   7 +-
 node_modules/semver/package.json                  |   7 +-
 node_modules/shelljs/package.json                 |   9 +-
 node_modules/underscore/package.json              |   9 +-
 node_modules/unorm/package.json                   |  11 +-
 node_modules/util-deprecate/package.json          |   7 +-
 node_modules/wrappy/package.json                  |   9 +-
 node_modules/xmlbuilder/package.json              |   7 +-
 node_modules/xmldom/package.json                  |  28 +++-
 42 files changed, 542 insertions(+), 178 deletions(-)

diff --git a/node_modules/abbrev/package.json b/node_modules/abbrev/package.json
index e60d021..9fadf3e 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/nopt"
+      "/Users/jbowser/cordova/cordova-android/node_modules/nopt"
     ]
   ],
   "_from": "abbrev@>=1.0.0 <2.0.0",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/nopt"
   ],
-  "_resolved": "http://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
   "_shasum": "d0554c2256636e2f56e7c2e5ad183f859428d81f",
   "_shrinkwrap": null,
   "_spec": "abbrev@1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/nopt",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me"
@@ -77,8 +77,7 @@
   ],
   "name": "abbrev",
   "optionalDependencies": {},
-  "readme": "# abbrev-js\n\nJust like [ruby's Abbrev](http://apidock.com/ruby/Abbrev).\n\nUsage:\n\n    var abbrev = require(\"abbrev\");\n    abbrev(\"foo\", \"fool\", \"folding\", \"flop\");\n    \n    // returns:\n    { fl: 'flop'\n    , flo: 'flop'\n    , flop: 'flop'\n    , fol: 'folding'\n    , fold: 'folding'\n    , foldi: 'folding'\n    , foldin: 'folding'\n    , folding: 'folding'\n    , foo: 'foo'\n    , fool: 'fool'\n    }\n\nThis is handy for command-line scripts, or other ca [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/isaacs/abbrev-js.git"
diff --git a/node_modules/android-versions/.jshintignore b/node_modules/android-versions/.jshintignore
new file mode 100644
index 0000000..2e98972
--- /dev/null
+++ b/node_modules/android-versions/.jshintignore
@@ -0,0 +1,8 @@
+.git/
+node_modules/
+coverage/
+build/
+assets/
+dist/
+docs/
+tests/
\ No newline at end of file
diff --git a/node_modules/android-versions/.jshintrc b/node_modules/android-versions/.jshintrc
new file mode 100644
index 0000000..e19b383
--- /dev/null
+++ b/node_modules/android-versions/.jshintrc
@@ -0,0 +1,28 @@
+{
+  "indent":   2,
+  "forin":    true,
+  "noarg":    true,
+  "bitwise":  true,
+  "nonew":    true,
+  "strict":   true,
+
+  "browser":  true,
+  "devel":    true,
+  "node":     false,
+  "jquery":   false,
+  "esnext":   false,
+  "moz":      false,
+  "es3":      false,
+
+  "asi":      true,
+
+  "eqnull":   true,
+  "debug":    true,
+  "boss":     true,
+  "evil":     true,
+  "loopfunc": true,
+  "laxbreak": true,
+
+  "unused":   true,
+  "undef":    true
+}
\ No newline at end of file
diff --git a/node_modules/android-versions/.travis.yml b/node_modules/android-versions/.travis.yml
new file mode 100644
index 0000000..4c19fbe
--- /dev/null
+++ b/node_modules/android-versions/.travis.yml
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - "6.1.0"
\ No newline at end of file
diff --git a/node_modules/android-versions/README.md b/node_modules/android-versions/README.md
new file mode 100644
index 0000000..79d63bc
--- /dev/null
+++ b/node_modules/android-versions/README.md
@@ -0,0 +1,87 @@
+Android Versions
+================
+
+A node module to get Android versions by API level, NDK level, semantic version, or version name.
+
+Versions are referenced from [source.android.com/source/build-numbers.html](https://source.android.com/source/build-numbers.html#platform-code-names-versions-api-levels-and-ndk-releases). The version for "Current Development Build" (`"CUR_DEVELOPMENT"`) is not included in the list of `VERSIONS`.
+
+[![NPM version][npm-image]][npm-url]
+[![build status][travis-image]][travis-url]
+
+[npm-image]: https://img.shields.io/npm/v/android-versions.svg?style=flat-square
+[npm-url]: https://npmjs.org/package/android-versions
+[travis-image]: https://img.shields.io/travis/dvoiss/android-versions.svg?style=flat-square
+[travis-url]: https://travis-ci.org/dvoiss/android-versions
+
+## Install
+
+```bash
+# NPM
+npm install android-versions --save
+# YARN
+yarn add android-versions
+```
+
+## Usage
+
+View the tests for more advanced usage.
+
+```javascript
+const android = require('android-versions')
+```
+
+#### Get by API level:
+```javascript
+console.log(android.get(23))
+
+=> { api: 23, ndk: 8, semver: "6.0", name: "Marshmallow", versionCode: "M" }
+```
+
+#### Get by version:
+
+```javascript
+console.log(android.get("2.3.3"))
+
+=> { api: 10, ndk: 5, semver: "2.3.3", name: "Gingerbread", versionCode: "GINGERBREAD_MR1" }
+```
+
+#### Get all by predicate:
+
+```
+android.getAll((version) => {
+  return version.ndk > 5 && version.api < 15
+}).map((version) => version.versionCode)
+
+=> [ "HONEYCOMB_MR1", "HONEYCOMB_MR2", "ICE_CREAM_SANDWICH" ]
+```
+
+#### Access a specific version with all info:
+
+```
+android.LOLLIPOP
+
+=> { api: 21, ndk: 8, semver: "5.0", name: "Lollipop", versionCode: "LOLLIPOP" }
+```
+
+#### Access the complete reference of Android versions with all info:
+
+```javascript
+android.VERSIONS
+
+=> {
+  BASE:    { api: 1,  ndk: 0, semver: "1.0", name: "(no code name)", versionCode: "BASE" },
+  ...
+  N:       { api: 24, ndk: 8, semver: "7.0", name: "Nougat",         versionCode: "N" }
+  ...
+}
+```
+
+## Test
+
+```bash
+npm run test
+```
+
+## License
+
+MIT
\ No newline at end of file
diff --git a/node_modules/android-versions/index.js b/node_modules/android-versions/index.js
new file mode 100644
index 0000000..cedbaf6
--- /dev/null
+++ b/node_modules/android-versions/index.js
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2016, David Voiss <da...@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any purpose
+ * with or without fee is hereby granted, provided that the above copyright notice
+ * and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+ * THIS SOFTWARE.
+*/
+
+/* jshint node: true */
+"use strict";
+
+/**
+ * A module to get Android versions by API level, NDK level, semantic version, or version name.
+ *
+ * Versions are referenced from here:
+ * {@link https://source.android.com/source/build-numbers.html#platform-code-names-versions-api-levels-and-ndk-releases}
+ * {@link https://github.com/android/platform_frameworks_base/blob/master/core/java/android/os/Build.java}
+ *
+ * The version for "Current Development Build" ("CUR_DEVELOPMENT") is not included.
+ *
+ * @module android-versions
+ */
+
+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" }
+}
+
+// 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+$/)) {
+    return semver + '.0'
+  } else {
+    return semver
+  }
+}
+
+// The default predicate compares against API level, semver, name, or code.
+function getFromDefaultPredicate(arg) {
+  // Coerce arg to string for comparisons below.
+  arg = arg.toString()
+
+  return getFromPredicate(function(version) {
+    // Check API level before all else.
+    if (arg === version.api.toString()) {
+      return true
+    }
+
+    // Compare semver and alternate semver (see above).
+    var altSemVer = getAlternateSemVer(arg)
+    if (version.semver === arg || version.semver === altSemVer) {
+      return true
+    }
+
+    // Compare version name and code.
+    return arg === version.name || arg === version.versionCode
+  })
+}
+
+// The function to allow passing a predicate.
+function getFromPredicate(predicate) {
+  if (predicate === null) {
+    return null
+  }
+
+  return Object.keys(VERSIONS).filter(function(version) {
+    return predicate(VERSIONS[version])
+  }).map(function(key) { return VERSIONS[key] })
+}
+
+/**
+ * The Android version codes available as keys for easier look-up.
+ */
+Object.keys(VERSIONS).forEach(function(name) {
+  exports[name] = VERSIONS[name]
+})
+
+/**
+ * The complete reference of Android versions for easier look-up.
+ */
+exports.VERSIONS = VERSIONS
+
+/**
+ * Retrieve a single Android version.
+ *
+ * @param {object | Function} arg - The value or predicate to use to retrieve values.
+ *
+ * @return {object} An object representing the version found or null if none found.
+ */
+exports.get = function(arg) {
+  var result = exports.getAll(arg)
+
+  if (result === null || result.length === 0) {
+    return null
+  }
+
+  return result[0]
+}
+
+/**
+ * Retrieve all Android versions that meet the criteria of the argument.
+ *
+ * @param {object | Function} arg - The value or predicate to use to retrieve values.
+ *
+ * @return {object} An object representing the version found or null if none found.
+ */
+exports.getAll = function(arg) {
+  if (arg === null) {
+    return null
+  }
+
+  if (typeof arg === "function") {
+    return getFromPredicate(arg)
+  } else {
+    return getFromDefaultPredicate(arg)
+  }
+}
\ No newline at end of file
diff --git a/node_modules/android-versions/package.json b/node_modules/android-versions/package.json
new file mode 100644
index 0000000..e47f424
--- /dev/null
+++ b/node_modules/android-versions/package.json
@@ -0,0 +1,103 @@
+{
+  "_args": [
+    [
+      {
+        "raw": "android-versions@^1.2.0",
+        "scope": null,
+        "escapedName": "android-versions",
+        "name": "android-versions",
+        "rawSpec": "^1.2.0",
+        "spec": ">=1.2.0 <2.0.0",
+        "type": "range"
+      },
+      "/Users/jbowser/cordova/cordova-android"
+    ]
+  ],
+  "_from": "android-versions@>=1.2.0 <2.0.0",
+  "_id": "android-versions@1.2.1",
+  "_inCache": true,
+  "_location": "/android-versions",
+  "_nodeVersion": "8.0.0",
+  "_npmOperationalInternal": {
+    "host": "s3://npm-registry-packages",
+    "tmp": "tmp/android-versions-1.2.1.tgz_1505373302036_0.5689644906669855"
+  },
+  "_npmUser": {
+    "name": "dvoiss",
+    "email": "davidvoiss@gmail.com"
+  },
+  "_npmVersion": "5.4.0",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "android-versions@^1.2.0",
+    "scope": null,
+    "escapedName": "android-versions",
+    "name": "android-versions",
+    "rawSpec": "^1.2.0",
+    "spec": ">=1.2.0 <2.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.2.1.tgz",
+  "_shasum": "3f50baf693e73a512c3c5403542291cead900063",
+  "_shrinkwrap": null,
+  "_spec": "android-versions@^1.2.0",
+  "_where": "/Users/jbowser/cordova/cordova-android",
+  "author": {
+    "name": "dvoiss"
+  },
+  "bugs": {
+    "url": "https://github.com/dvoiss/android-versions/issues"
+  },
+  "dependencies": {},
+  "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"
+  },
+  "gitHead": "7e2def6e70634a4ebcaaa639a4c4955ae2a566e7",
+  "homepage": "https://github.com/dvoiss/android-versions#readme",
+  "keywords": [
+    "android",
+    "version",
+    "versions",
+    "ndk",
+    "nougat",
+    "marshmallow",
+    "api",
+    "level"
+  ],
+  "license": "MIT",
+  "main": "index.js",
+  "maintainers": [
+    {
+      "name": "dvoiss",
+      "email": "davidvoiss@gmail.com"
+    }
+  ],
+  "name": "android-versions",
+  "optionalDependencies": {},
+  "pre-commit": [
+    "jshint"
+  ],
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "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"
+}
diff --git a/node_modules/ansi/package.json b/node_modules/ansi/package.json
index 06adf89..ef08fe3 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
     ]
   ],
   "_from": "ansi@>=0.3.1 <0.4.0",
@@ -36,11 +36,11 @@
   "_requiredBy": [
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+  "_resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
   "_shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21",
   "_shrinkwrap": null,
   "_spec": "ansi@^0.3.1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "author": {
     "name": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
@@ -83,8 +83,7 @@
   ],
   "name": "ansi",
   "optionalDependencies": {},
-  "readme": "ansi.js\n=========\n### Advanced ANSI formatting tool for Node.js\n\n`ansi.js` is a module for Node.js that provides an easy-to-use API for\nwriting ANSI escape codes to `Stream` instances. ANSI escape codes are used to do\nfancy things in a terminal window, like render text in colors, delete characters,\nlines, the entire window, or hide and show the cursor, and lots more!\n\n#### Features:\n\n * 256 color support for the terminal!\n * Make a beep sound from your terminal!\ [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/TooTallNate/ansi.js.git"
diff --git a/node_modules/balanced-match/package.json b/node_modules/balanced-match/package.json
index 6504720..46947a4 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/brace-expansion"
+      "/Users/jbowser/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/steveng/repo/cordova/cordova-android/node_modules/brace-expansion",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/brace-expansion",
   "author": {
     "name": "Julian Gruber",
     "email": "mail@juliangruber.com",
@@ -83,8 +83,7 @@
   ],
   "name": "balanced-match",
   "optionalDependencies": {},
-  "readme": "# balanced-match\n\nMatch balanced string pairs, like `{` and `}` or `<b>` and `</b>`. Supports regular expressions as well!\n\n[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)\n[![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)\n\n[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/julia [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/juliangruber/balanced-match.git"
diff --git a/node_modules/base64-js/package.json b/node_modules/base64-js/package.json
index 93ed651..990a597 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/plist"
+      "/Users/jbowser/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/steveng/repo/cordova/cordova-android/node_modules/plist",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/plist",
   "author": {
     "name": "T. Jameson Little",
     "email": "t.jameson.little@gmail.com"
@@ -62,7 +62,7 @@
     "node": ">= 0.4"
   },
   "gitHead": "b4a8a5fa9b0caeddb5ad94dd1108253d8f2a315f",
-  "homepage": "https://github.com/beatgammit/base64-js#readme",
+  "homepage": "https://github.com/beatgammit/base64-js",
   "license": "MIT",
   "main": "lib/b64.js",
   "maintainers": [
@@ -77,8 +77,7 @@
   ],
   "name": "base64-js",
   "optionalDependencies": {},
-  "readme": "base64-js\n=========\n\n`base64-js` does basic base64 encoding/decoding in pure JS.\n\n[![build status](https://secure.travis-ci.org/beatgammit/base64-js.png)](http://travis-ci.org/beatgammit/base64-js)\n\n[![testling badge](https://ci.testling.com/beatgammit/base64-js.png)](https://ci.testling.com/beatgammit/base64-js)\n\nMany browsers already have base64 encoding/decoding functionality, but it is for text data, not all-purpose binary data.\n\nSometimes encoding/decoding bi [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/beatgammit/base64-js.git"
diff --git a/node_modules/big-integer/BigInteger.js b/node_modules/big-integer/BigInteger.js
index 56e3792..8ba8843 100644
--- a/node_modules/big-integer/BigInteger.js
+++ b/node_modules/big-integer/BigInteger.js
@@ -1143,11 +1143,13 @@ var bigInt = (function (undefined) {
         var sign = this.sign ? "-" : "";
         return sign + str;
     };
+
     SmallInteger.prototype.toString = function (radix) {
         if (radix === undefined) radix = 10;
         if (radix != 10) return toBase(this, radix);
         return String(this.value);
     };
+    BigInteger.prototype.toJSON = SmallInteger.prototype.toJSON = function() { return this.toString(); }
 
     BigInteger.prototype.valueOf = function () {
         return +this.toString();
diff --git a/node_modules/big-integer/BigInteger.min.js b/node_modules/big-integer/BigInteger.min.js
index 8ee9a89..99ea9fb 100644
--- a/node_modules/big-integer/BigInteger.min.js
+++ b/node_modules/big-integer/BigInteger.min.js
@@ -1 +1 @@
-var bigInt=function(undefined){"use strict";var BASE=1e7,LOG_BASE=7,MAX_INT=9007199254740992,MAX_INT_ARR=smallToArray(MAX_INT),LOG_MAX_INT=Math.log(MAX_INT);function Integer(v,radix){if(typeof v==="undefined")return Integer[0];if(typeof radix!=="undefined")return+radix===10?parseValue(v):parseBase(v,radix);return parseValue(v)}function BigInteger(value,sign){this.value=value;this.sign=sign;this.isSmall=false}BigInteger.prototype=Object.create(Integer.prototype);function SmallInteger(valu [...]
\ No newline at end of file
+var bigInt=function(undefined){"use strict";var BASE=1e7,LOG_BASE=7,MAX_INT=9007199254740992,MAX_INT_ARR=smallToArray(MAX_INT),LOG_MAX_INT=Math.log(MAX_INT);function Integer(v,radix){if(typeof v==="undefined")return Integer[0];if(typeof radix!=="undefined")return+radix===10?parseValue(v):parseBase(v,radix);return parseValue(v)}function BigInteger(value,sign){this.value=value;this.sign=sign;this.isSmall=false}BigInteger.prototype=Object.create(Integer.prototype);function SmallInteger(valu [...]
\ No newline at end of file
diff --git a/node_modules/big-integer/package.json b/node_modules/big-integer/package.json
index 2b626bd..ef26cbe 100644
--- a/node_modules/big-integer/package.json
+++ b/node_modules/big-integer/package.json
@@ -10,17 +10,17 @@
         "spec": ">=1.6.7 <2.0.0",
         "type": "range"
       },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser"
+      "/Users/jbowser/cordova/cordova-android/node_modules/bplist-parser"
     ]
   ],
   "_from": "big-integer@>=1.6.7 <2.0.0",
-  "_id": "big-integer@1.6.24",
+  "_id": "big-integer@1.6.25",
   "_inCache": true,
   "_location": "/big-integer",
   "_nodeVersion": "6.10.3",
   "_npmOperationalInternal": {
     "host": "s3://npm-registry-packages",
-    "tmp": "tmp/big-integer-1.6.24.tgz_1503027511676_0.881959781749174"
+    "tmp": "tmp/big-integer-1.6.25.tgz_1504748727289_0.9231066561769694"
   },
   "_npmUser": {
     "name": "peterolson",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/bplist-parser"
   ],
-  "_resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.24.tgz",
-  "_shasum": "1ed84d018ac3c1c72b307e7f7d94008e8ee20311",
+  "_resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.25.tgz",
+  "_shasum": "1de45a9f57542ac20121c682f8d642220a34e823",
   "_shrinkwrap": null,
   "_spec": "big-integer@^1.6.7",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/bplist-parser",
   "author": {
     "name": "Peter Olson",
     "email": "peter.e.c.olson+npm@gmail.com"
@@ -72,13 +72,13 @@
   },
   "directories": {},
   "dist": {
-    "shasum": "1ed84d018ac3c1c72b307e7f7d94008e8ee20311",
-    "tarball": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.24.tgz"
+    "shasum": "1de45a9f57542ac20121c682f8d642220a34e823",
+    "tarball": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.25.tgz"
   },
   "engines": {
     "node": ">=0.6"
   },
-  "gitHead": "8ac5ef5b7c4abce8e943776fa2f18d3d41697988",
+  "gitHead": "a0c10d68aae8f5df56a67b3e3eb353b428abf170",
   "homepage": "https://github.com/peterolson/BigInteger.js#readme",
   "keywords": [
     "math",
@@ -101,8 +101,7 @@
   ],
   "name": "big-integer",
   "optionalDependencies": {},
-  "readme": "# BigInteger.js [![Build Status][travis-img]][travis-url] [![Coverage Status][coveralls-img]][coveralls-url] [![Monthly Downloads][downloads-img]][downloads-url]\r\n\r\n[travis-url]: https://travis-ci.org/peterolson/BigInteger.js\r\n[travis-img]: https://travis-ci.org/peterolson/BigInteger.js.svg?branch=master\r\n[coveralls-url]: https://coveralls.io/github/peterolson/BigInteger.js?branch=master\r\n[coveralls-img]: https://coveralls.io/repos/peterolson/BigInteger.js/badge.sv [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/peterolson/BigInteger.js.git"
@@ -112,5 +111,5 @@
     "test": "tsc && node_modules/.bin/karma start my.conf.js && node spec/tsDefinitions.js"
   },
   "typings": "./BigInteger.d.ts",
-  "version": "1.6.24"
+  "version": "1.6.25"
 }
diff --git a/node_modules/bplist-parser/package.json b/node_modules/bplist-parser/package.json
index e0bc424..89dfc8d 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
     ]
   ],
   "_from": "bplist-parser@>=0.1.0 <0.2.0",
@@ -36,11 +36,11 @@
   "_requiredBy": [
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+  "_resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
   "_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6",
   "_shrinkwrap": null,
   "_spec": "bplist-parser@^0.1.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "author": {
     "name": "Joe Ferner",
     "email": "joe.ferner@nearinfinity.com"
@@ -77,8 +77,7 @@
   ],
   "name": "bplist-parser",
   "optionalDependencies": {},
-  "readme": "bplist-parser\n=============\n\nBinary Mac OS X Plist (property list) parser.\n\n## Installation\n\n```bash\n$ npm install bplist-parser\n```\n\n## Quick Examples\n\n```javascript\nvar bplist = require('bplist-parser');\n\nbplist.parseFile('myPlist.bplist', function(err, obj) {\n  if (err) throw err;\n\n  console.log(JSON.stringify(obj));\n});\n```\n\n## License\n\n(The MIT License)\n\nCopyright (c) 2012 Near Infinity Corporation\n\nPermission is hereby granted, free of char [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nearinfinity/node-bplist-parser.git"
diff --git a/node_modules/brace-expansion/package.json b/node_modules/brace-expansion/package.json
index f803589..a8768dc 100644
--- a/node_modules/brace-expansion/package.json
+++ b/node_modules/brace-expansion/package.json
@@ -10,7 +10,7 @@
         "spec": ">=1.1.7 <2.0.0",
         "type": "range"
       },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch"
+      "/Users/jbowser/cordova/cordova-android/node_modules/minimatch"
     ]
   ],
   "_from": "brace-expansion@>=1.1.7 <2.0.0",
@@ -44,7 +44,7 @@
   "_shasum": "c07b211c7c952ec1f8efd51a77ef0d1d3990a292",
   "_shrinkwrap": null,
   "_spec": "brace-expansion@^1.1.7",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/minimatch",
   "author": {
     "name": "Julian Gruber",
     "email": "mail@juliangruber.com",
@@ -84,8 +84,7 @@
   ],
   "name": "brace-expansion",
   "optionalDependencies": {},
-  "readme": "# brace-expansion\n\n[Brace expansion](https://www.gnu.org/software/bash/manual/html_node/Brace-Expansion.html), \nas known from sh/bash, in JavaScript.\n\n[![build status](https://secure.travis-ci.org/juliangruber/brace-expansion.svg)](http://travis-ci.org/juliangruber/brace-expansion)\n[![downloads](https://img.shields.io/npm/dm/brace-expansion.svg)](https://www.npmjs.org/package/brace-expansion)\n[![Greenkeeper badge](https://badges.greenkeeper.io/juliangruber/brace-expan [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/juliangruber/brace-expansion.git"
diff --git a/node_modules/concat-map/package.json b/node_modules/concat-map/package.json
index bfbfe3f..7b6bcac 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/brace-expansion"
+      "/Users/jbowser/cordova/cordova-android/node_modules/brace-expansion"
     ]
   ],
   "_from": "concat-map@0.0.1",
@@ -35,11 +35,11 @@
   "_requiredBy": [
     "/brace-expansion"
   ],
-  "_resolved": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+  "_resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
   "_shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
   "_shrinkwrap": null,
   "_spec": "concat-map@0.0.1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/brace-expansion",
   "author": {
     "name": "James Halliday",
     "email": "mail@substack.net",
@@ -61,7 +61,7 @@
     "shasum": "d8a96bd77fd68df7793a73036a3ba0d5405d477b",
     "tarball": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
   },
-  "homepage": "https://github.com/substack/node-concat-map#readme",
+  "homepage": "https://github.com/substack/node-concat-map",
   "keywords": [
     "concat",
     "concatMap",
@@ -79,8 +79,7 @@
   ],
   "name": "concat-map",
   "optionalDependencies": {},
-  "readme": "concat-map\n==========\n\nConcatenative mapdashery.\n\n[![browser support](http://ci.testling.com/substack/node-concat-map.png)](http://ci.testling.com/substack/node-concat-map)\n\n[![build status](https://secure.travis-ci.org/substack/node-concat-map.png)](http://travis-ci.org/substack/node-concat-map)\n\nexample\n=======\n\n``` js\nvar concatMap = require('concat-map');\nvar xs = [ 1, 2, 3, 4, 5, 6 ];\nvar ys = concatMap(xs, function (x) {\n    return x % 2 ? [ x - 0.1, x, [...]
-  "readmeFilename": "README.markdown",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/substack/node-concat-map.git"
diff --git a/node_modules/cordova-common/package.json b/node_modules/cordova-common/package.json
index d7fb135..3ac0c10 100644
--- a/node_modules/cordova-common/package.json
+++ b/node_modules/cordova-common/package.json
@@ -10,7 +10,7 @@
         "spec": ">=2.1.0 <3.0.0",
         "type": "range"
       },
-      "/Users/steveng/repo/cordova/cordova-android"
+      "/Users/jbowser/cordova/cordova-android"
     ]
   ],
   "_from": "cordova-common@>=2.1.0 <3.0.0",
@@ -44,7 +44,7 @@
   "_shasum": "bb357ee1b9825031ed9db3c56b592efe973d1640",
   "_shrinkwrap": null,
   "_spec": "cordova-common@^2.1.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android",
+  "_where": "/Users/jbowser/cordova/cordova-android",
   "author": {
     "name": "Apache Software Foundation"
   },
@@ -133,8 +133,7 @@
   ],
   "name": "cordova-common",
   "optionalDependencies": {},
-  "readme": "<!--\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements.  See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership.  The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License.  You may obtain a copy of the License at\n#\n# http://www.apache.org/licenses/LICENSE-2. [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/apache/cordova-lib.git"
diff --git a/node_modules/cordova-registry-mapper/package.json b/node_modules/cordova-registry-mapper/package.json
index aa1da6a..088dd04 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/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": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz",
+  "_resolved": "https://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/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "author": {
     "name": "Steve Gill"
   },
@@ -73,8 +73,7 @@
   ],
   "name": "cordova-registry-mapper",
   "optionalDependencies": {},
-  "readme": "[![Build Status](https://travis-ci.org/stevengill/cordova-registry-mapper.svg?branch=master)](https://travis-ci.org/stevengill/cordova-registry-mapper)\n\n#Cordova Registry Mapper\n\nThis module is used to map Cordova plugin ids to package names and vice versa.\n\nWhen Cordova users add plugins to their projects using ids\n(e.g. `cordova plugin add org.apache.cordova.device`),\nthis module will map that id to the corresponding package name so `cordova-lib` knows what to fetc [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/stevengill/cordova-registry-mapper.git"
diff --git a/node_modules/elementtree/package.json b/node_modules/elementtree/package.json
index ffb3cc4..ef3c3d4 100644
--- a/node_modules/elementtree/package.json
+++ b/node_modules/elementtree/package.json
@@ -10,7 +10,7 @@
         "spec": "0.1.6",
         "type": "version"
       },
-      "/Users/steveng/repo/cordova/cordova-android"
+      "/Users/jbowser/cordova/cordova-android"
     ]
   ],
   "_from": "elementtree@0.1.6",
@@ -36,11 +36,11 @@
     "/",
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
+  "_resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
   "_shasum": "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c",
   "_shrinkwrap": null,
   "_spec": "elementtree@0.1.6",
-  "_where": "/Users/steveng/repo/cordova/cordova-android",
+  "_where": "/Users/jbowser/cordova/cordova-android",
   "author": {
     "name": "Rackspace US, Inc."
   },
@@ -97,8 +97,7 @@
   ],
   "name": "elementtree",
   "optionalDependencies": {},
-  "readme": "node-elementtree\n====================\n\nnode-elementtree is a [Node.js](http://nodejs.org) XML parser and serializer based upon the [Python ElementTree v1.3](http://effbot.org/zone/element-index.htm) module.\n\nInstallation\n====================\n\n    $ npm install elementtree\n    \nUsing the library\n====================\n\nFor the usage refer to the Python ElementTree library documentation - [http://effbot.org/zone/element-index.htm#usage](http://effbot.org/zone/elemen [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/racker/node-elementtree.git"
diff --git a/node_modules/glob/package.json b/node_modules/glob/package.json
index 79cfdb1..6054ad3 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
     ]
   ],
   "_from": "glob@>=5.0.13 <6.0.0",
@@ -36,11 +36,11 @@
   "_requiredBy": [
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
   "_shasum": "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1",
   "_shrinkwrap": null,
   "_spec": "glob@^5.0.13",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -88,8 +88,7 @@
   ],
   "name": "glob",
   "optionalDependencies": {},
-  "readme": "[![Build Status](https://travis-ci.org/isaacs/node-glob.svg?branch=master)](https://travis-ci.org/isaacs/node-glob/) [![Dependency Status](https://david-dm.org/isaacs/node-glob.svg)](https://david-dm.org/isaacs/node-glob) [![devDependency Status](https://david-dm.org/isaacs/node-glob/dev-status.svg)](https://david-dm.org/isaacs/node-glob#info=devDependencies) [![optionalDependency Status](https://david-dm.org/isaacs/node-glob/optional-status.svg)](https://david-dm.org/isaacs [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/node-glob.git"
diff --git a/node_modules/inflight/package.json b/node_modules/inflight/package.json
index d73d3c2..dbbf156 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/glob"
+      "/Users/jbowser/cordova/cordova-android/node_modules/glob"
     ]
   ],
   "_from": "inflight@>=1.0.4 <2.0.0",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/glob"
   ],
-  "_resolved": "http://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+  "_resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
   "_shasum": "49bd6331d7d02d0c09bc910a1075ba8165b56df9",
   "_shrinkwrap": null,
   "_spec": "inflight@^1.0.4",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/glob",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -93,8 +93,7 @@
   ],
   "name": "inflight",
   "optionalDependencies": {},
-  "readme": "# inflight\n\nAdd callbacks to requests in flight to avoid async duplication\n\n## USAGE\n\n```javascript\nvar inflight = require('inflight')\n\n// some request that does some stuff\nfunction req(key, callback) {\n  // key is any random string.  like a url or filename or whatever.\n  //\n  // will return either a falsey value, indicating that the\n  // request for this key is already in flight, or a new callback\n  // which when called will call all callbacks passed to infli [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/inflight.git"
diff --git a/node_modules/inherits/package.json b/node_modules/inherits/package.json
index e9e085a..4805cb6 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/glob"
+      "/Users/jbowser/cordova/cordova-android/node_modules/glob"
     ]
   ],
   "_from": "inherits@>=2.0.0 <3.0.0",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/glob"
   ],
-  "_resolved": "http://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+  "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
   "_shasum": "633c2c83e3da42a502f52466022480f4208261de",
   "_shrinkwrap": null,
   "_spec": "inherits@2",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/glob",
   "browser": "./inherits_browser.js",
   "bugs": {
     "url": "https://github.com/isaacs/inherits/issues"
@@ -85,8 +85,7 @@
   ],
   "name": "inherits",
   "optionalDependencies": {},
-  "readme": "Browser-friendly inheritance fully compatible with standard node.js\n[inherits](http://nodejs.org/api/util.html#util_util_inherits_constructor_superconstructor).\n\nThis package exports standard `inherits` from node.js `util` module in\nnode environment, but also provides alternative browser-friendly\nimplementation through [browser\nfield](https://gist.github.com/shtylman/4339901). Alternative\nimplementation is a literal copy of standard one located in standalone\nmodule t [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/inherits.git"
diff --git a/node_modules/lodash/package.json b/node_modules/lodash/package.json
index f68079e..2a0b543 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/xmlbuilder"
+      "/Users/jbowser/cordova/cordova-android/node_modules/xmlbuilder"
     ]
   ],
   "_from": "lodash@>=3.5.0 <4.0.0",
@@ -36,11 +36,11 @@
   "_requiredBy": [
     "/xmlbuilder"
   ],
-  "_resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+  "_resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
   "_shasum": "5bf45e8e49ba4189e17d482789dfd15bd140b7b6",
   "_shrinkwrap": null,
   "_spec": "lodash@^3.5.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/xmlbuilder",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/xmlbuilder",
   "author": {
     "name": "John-David Dalton",
     "email": "john.david.dalton@gmail.com",
@@ -117,8 +117,7 @@
   ],
   "name": "lodash",
   "optionalDependencies": {},
-  "readme": "# lodash v3.10.1\n\nThe [modern build](https://github.com/lodash/lodash/wiki/Build-Differences) of [lodash](https://lodash.com/) exported as [Node.js](http://nodejs.org/)/[io.js](https://iojs.org/) modules.\n\nGenerated using [lodash-cli](https://www.npmjs.com/package/lodash-cli):\n```bash\n$ lodash modularize modern exports=node -o ./\n$ lodash modern -d -o ./index.js\n```\n\n## Installation\n\nUsing npm:\n\n```bash\n$ {sudo -H} npm i -g npm\n$ npm i --save lodash\n```\n\nI [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lodash/lodash.git"
diff --git a/node_modules/minimatch/package.json b/node_modules/minimatch/package.json
index de7334a..c37746f 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/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/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -85,8 +85,7 @@
   ],
   "name": "minimatch",
   "optionalDependencies": {},
-  "readme": "# minimatch\n\nA minimal matching utility.\n\n[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.svg)](http://travis-ci.org/isaacs/minimatch)\n\n\nThis is the matching library used internally by npm.\n\nIt works by converting glob expressions into JavaScript `RegExp`\nobjects.\n\n## Usage\n\n```javascript\nvar minimatch = require(\"minimatch\")\n\nminimatch(\"bar.foo\", \"*.foo\") // true!\nminimatch(\"bar.foo\", \"*.bar\") // false!\nminimatch(\"bar.foo\", \"*.+ [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/minimatch.git"
diff --git a/node_modules/nopt/package.json b/node_modules/nopt/package.json
index 22ed6ec..516dc8a 100644
--- 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/steveng/repo/cordova/cordova-android"
+      "/Users/jbowser/cordova/cordova-android"
     ]
   ],
   "_from": "nopt@>=3.0.1 <4.0.0",
@@ -36,11 +36,11 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "http://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+  "_resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
   "_shasum": "c6465dbf08abcd4db359317f79ac68a646b28ff9",
   "_shrinkwrap": null,
   "_spec": "nopt@^3.0.1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android",
+  "_where": "/Users/jbowser/cordova/cordova-android",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -84,8 +84,7 @@
   ],
   "name": "nopt",
   "optionalDependencies": {},
-  "readme": "If you want to write an option parser, and have it be good, there are\ntwo ways to do it.  The Right Way, and the Wrong Way.\n\nThe Wrong Way is to sit down and write an option parser.  We've all done\nthat.\n\nThe Right Way is to write some complex configurable program with so many\noptions that you hit the limit of your frustration just trying to\nmanage them all, and defer it with duct-tape solutions until you see\nexactly to the core of the problem, and finally snap and  [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/nopt.git"
diff --git a/node_modules/once/package.json b/node_modules/once/package.json
index 3d4e860..7211805 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/glob"
+      "/Users/jbowser/cordova/cordova-android/node_modules/glob"
     ]
   ],
   "_from": "once@>=1.3.0 <2.0.0",
@@ -41,11 +41,11 @@
     "/glob",
     "/inflight"
   ],
-  "_resolved": "http://registry.npmjs.org/once/-/once-1.4.0.tgz",
+  "_resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
   "_shasum": "583b1aa775961d4b113ac17d9c50baef9dd76bd1",
   "_shrinkwrap": null,
   "_spec": "once@^1.3.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/glob",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -89,8 +89,7 @@
   ],
   "name": "once",
   "optionalDependencies": {},
-  "readme": "# once\n\nOnly call a function once.\n\n## usage\n\n```javascript\nvar once = require('once')\n\nfunction load (file, cb) {\n  cb = once(cb)\n  loader.load('file')\n  loader.once('load', cb)\n  loader.once('error', cb)\n}\n```\n\nOr add to the Function.prototype in a responsible way:\n\n```javascript\n// only has to be done once\nrequire('once').proto()\n\nfunction load (file, cb) {\n  cb = cb.once()\n  loader.load('file')\n  loader.once('load', cb)\n  loader.once('error', c [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/once.git"
diff --git a/node_modules/os-homedir/package.json b/node_modules/os-homedir/package.json
index 0eb3a24..f9a51eb 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/osenv"
+      "/Users/jbowser/cordova/cordova-android/node_modules/osenv"
     ]
   ],
   "_from": "os-homedir@>=1.0.0 <2.0.0",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/osenv"
   ],
-  "_resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+  "_resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
   "_shasum": "ffbc4988336e0e833de0c168c7ef152121aa7fb3",
   "_shrinkwrap": null,
   "_spec": "os-homedir@^1.0.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/osenv",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
@@ -97,8 +97,7 @@
   ],
   "name": "os-homedir",
   "optionalDependencies": {},
-  "readme": "# os-homedir [![Build Status](https://travis-ci.org/sindresorhus/os-homedir.svg?branch=master)](https://travis-ci.org/sindresorhus/os-homedir)\n\n> Node.js 4 [`os.homedir()`](https://nodejs.org/api/os.html#os_os_homedir) [ponyfill](https://ponyfill.com)\n\n\n## Install\n\n```\n$ npm install --save os-homedir\n```\n\n\n## Usage\n\n```js\nconst osHomedir = require('os-homedir');\n\nconsole.log(osHomedir());\n//=> '/Users/sindresorhus'\n```\n\n\n## Related\n\n- [user-home](http [...]
-  "readmeFilename": "readme.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/sindresorhus/os-homedir.git"
diff --git a/node_modules/os-tmpdir/package.json b/node_modules/os-tmpdir/package.json
index 2edc83b..b9d6541 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/osenv"
+      "/Users/jbowser/cordova/cordova-android/node_modules/osenv"
     ]
   ],
   "_from": "os-tmpdir@>=1.0.0 <2.0.0",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/osenv"
   ],
-  "_resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+  "_resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
   "_shasum": "bbe67406c79aa85c5cfec766fe5734555dfa1274",
   "_shrinkwrap": null,
   "_spec": "os-tmpdir@^1.0.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/osenv",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/osenv",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
@@ -97,8 +97,7 @@
   ],
   "name": "os-tmpdir",
   "optionalDependencies": {},
-  "readme": "# os-tmpdir [![Build Status](https://travis-ci.org/sindresorhus/os-tmpdir.svg?branch=master)](https://travis-ci.org/sindresorhus/os-tmpdir)\n\n> Node.js [`os.tmpdir()`](https://nodejs.org/api/os.html#os_os_tmpdir) [ponyfill](https://ponyfill.com)\n\nUse this instead of `require('os').tmpdir()` to get a consistent behavior on different Node.js versions (even 0.8).\n\n\n## Install\n\n```\n$ npm install --save os-tmpdir\n```\n\n\n## Usage\n\n```js\nconst osTmpdir = require('os- [...]
-  "readmeFilename": "readme.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/sindresorhus/os-tmpdir.git"
diff --git a/node_modules/osenv/package.json b/node_modules/osenv/package.json
index 87c5e5b..1ccdd7c 100644
--- a/node_modules/osenv/package.json
+++ b/node_modules/osenv/package.json
@@ -10,7 +10,7 @@
         "spec": ">=0.1.3 <0.2.0",
         "type": "range"
       },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
     ]
   ],
   "_from": "osenv@>=0.1.3 <0.2.0",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+  "_resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
   "_shasum": "42fe6d5953df06c8064be6f176c3d05aaaa34644",
   "_shrinkwrap": null,
   "_spec": "osenv@^0.1.3",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -101,8 +101,7 @@
   ],
   "name": "osenv",
   "optionalDependencies": {},
-  "readme": "# osenv\n\nLook up environment settings specific to different operating systems.\n\n## Usage\n\n```javascript\nvar osenv = require('osenv')\nvar path = osenv.path()\nvar user = osenv.user()\n// etc.\n\n// Some things are not reliably in the env, and have a fallback command:\nvar h = osenv.hostname(function (er, hostname) {\n  h = hostname\n})\n// This will still cause it to be memoized, so calling osenv.hostname()\n// is now an immediate operation.\n\n// You can always send  [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/osenv.git"
diff --git a/node_modules/path-is-absolute/package.json b/node_modules/path-is-absolute/package.json
index c29aaf2..514e8ce 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/glob"
+      "/Users/jbowser/cordova/cordova-android/node_modules/glob"
     ]
   ],
   "_from": "path-is-absolute@>=1.0.0 <2.0.0",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/glob"
   ],
-  "_resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+  "_resolved": "https://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/steveng/repo/cordova/cordova-android/node_modules/glob",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/glob",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
@@ -99,8 +99,7 @@
   ],
   "name": "path-is-absolute",
   "optionalDependencies": {},
-  "readme": "# path-is-absolute [![Build Status](https://travis-ci.org/sindresorhus/path-is-absolute.svg?branch=master)](https://travis-ci.org/sindresorhus/path-is-absolute)\n\n> Node.js 0.12 [`path.isAbsolute()`](http://nodejs.org/api/path.html#path_path_isabsolute_path) [ponyfill](https://ponyfill.com)\n\n\n## Install\n\n```\n$ npm install --save path-is-absolute\n```\n\n\n## Usage\n\n```js\nconst pathIsAbsolute = require('path-is-absolute');\n\n// Running on Linux\npathIsAbsolute('/ho [...]
-  "readmeFilename": "readme.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/sindresorhus/path-is-absolute.git"
diff --git a/node_modules/plist/package.json b/node_modules/plist/package.json
index 4cecbbc..15ac22a 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
     ]
   ],
   "_from": "plist@>=1.2.0 <2.0.0",
@@ -36,11 +36,11 @@
   "_requiredBy": [
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz",
+  "_resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz",
   "_shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593",
   "_shrinkwrap": null,
   "_spec": "plist@^1.2.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "author": {
     "name": "Nathan Rajlich",
     "email": "nathan@tootallnate.net"
@@ -113,8 +113,7 @@
   ],
   "name": "plist",
   "optionalDependencies": {},
-  "readme": "plist.js\n========\n### Mac OS X Plist parser/builder for Node.js and browsers\n\n[![Sauce Test Status](https://saucelabs.com/browser-matrix/plistjs.svg)](https://saucelabs.com/u/plistjs)\n\n[![Build Status](https://travis-ci.org/TooTallNate/plist.js.svg?branch=master)](https://travis-ci.org/TooTallNate/plist.js)\n\nProvides facilities for reading and writing Mac OS X Plist (property list)\nfiles. These are often used in programming OS X and iOS applications, as\nwell as the [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/TooTallNate/node-plist.git"
diff --git a/node_modules/properties-parser/package.json b/node_modules/properties-parser/package.json
index c23164f..fccf257 100644
--- 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/steveng/repo/cordova/cordova-android"
+      "/Users/jbowser/cordova/cordova-android"
     ]
   ],
   "_from": "properties-parser@>=0.2.3 <0.3.0",
@@ -35,11 +35,11 @@
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz",
+  "_resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz",
   "_shasum": "f7591255f707abbff227c7b56b637dbb0373a10f",
   "_shrinkwrap": null,
   "_spec": "properties-parser@^0.2.3",
-  "_where": "/Users/steveng/repo/cordova/cordova-android",
+  "_where": "/Users/jbowser/cordova/cordova-android",
   "bugs": {
     "url": "https://github.com/xavi-/node-properties-parser/issues"
   },
@@ -54,7 +54,7 @@
   "engines": {
     "node": ">= 0.3.1"
   },
-  "homepage": "https://github.com/xavi-/node-properties-parser#readme",
+  "homepage": "https://github.com/xavi-/node-properties-parser",
   "keywords": [
     "parser",
     ".properties",
@@ -66,15 +66,13 @@
   "main": "./index.js",
   "maintainers": [
     {
-      "name": "Xavi",
-      "email": "xavi.rmz@gmail.com",
-      "url": "http://xavi.co"
+      "name": "xavi",
+      "email": "xavi.rmz@gmail.com"
     }
   ],
   "name": "properties-parser",
   "optionalDependencies": {},
-  "readme": "# node-properties-parser\n\nA parser for [.properties](http://en.wikipedia.org/wiki/.properties) files written in javascript.  Properties files store key-value pairs.  They are typically used for configuration and internationalization in Java applications as well as in Actionscript projects.  Here's an example of the format:\n\n\t# You are reading the \".properties\" entry.\n\t! The exclamation mark can also mark text as comments.\n\twebsite = http://en.wikipedia.org/\n\tlan [...]
-  "readmeFilename": "README.markdown",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/xavi-/node-properties-parser.git"
diff --git a/node_modules/q/package.json b/node_modules/q/package.json
index 8f68f43..9253651 100644
--- 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/steveng/repo/cordova/cordova-android"
+      "/Users/jbowser/cordova/cordova-android"
     ]
   ],
   "_from": "q@>=1.4.1 <2.0.0",
@@ -41,11 +41,11 @@
     "/",
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/q/-/q-1.5.0.tgz",
+  "_resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
   "_shasum": "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1",
   "_shrinkwrap": null,
   "_spec": "q@^1.4.1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android",
+  "_where": "/Users/jbowser/cordova/cordova-android",
   "author": {
     "name": "Kris Kowal",
     "email": "kris@cixar.com",
@@ -137,8 +137,7 @@
       }
     }
   },
-  "readme": "[![Build Status](https://secure.travis-ci.org/kriskowal/q.svg?branch=master)](http://travis-ci.org/kriskowal/q)\n[![CDNJS](https://img.shields.io/cdnjs/v/q.js.svg)](https://cdnjs.com/libraries/q.js)\n\n<a href=\"http://promises-aplus.github.com/promises-spec\">\n    <img src=\"http://kriskowal.github.io/q/q.png\" align=\"right\" alt=\"Q logo\" />\n</a>\n\nIf a function cannot return a value or throw an exception without\nblocking, it can return a promise instead.  A promise  [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/kriskowal/q.git"
diff --git a/node_modules/sax/package.json b/node_modules/sax/package.json
index 1d3d7db..e36ea8d 100644
--- a/node_modules/sax/package.json
+++ b/node_modules/sax/package.json
@@ -10,7 +10,7 @@
         "spec": "0.3.5",
         "type": "version"
       },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/elementtree"
+      "/Users/jbowser/cordova/cordova-android/node_modules/elementtree"
     ]
   ],
   "_defaultsLoaded": true,
@@ -42,7 +42,7 @@
   "_shasum": "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d",
   "_shrinkwrap": null,
   "_spec": "sax@0.3.5",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/elementtree",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/elementtree",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -110,8 +110,7 @@
   ],
   "name": "sax",
   "optionalDependencies": {},
-  "readme": "# sax js\n\nA sax-style parser for XML and HTML.\n\nDesigned with [node](http://nodejs.org/) in mind, but should work fine in\nthe browser or other CommonJS implementations.\n\n## What This Is\n\n* A very simple tool to parse through an XML string.\n* A stepping stone to a streaming HTML parser.\n* A handy way to deal with RSS and other mostly-ok-but-kinda-broken XML \n  docs.\n\n## What This Is (probably) Not\n\n* An HTML Parser - That's a fine goal, but this isn't it.  It' [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/sax-js.git"
diff --git a/node_modules/semver/package.json b/node_modules/semver/package.json
index edd33a5..cdda5a7 100644
--- a/node_modules/semver/package.json
+++ b/node_modules/semver/package.json
@@ -10,7 +10,7 @@
         "spec": ">=5.0.1 <6.0.0",
         "type": "range"
       },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
     ]
   ],
   "_from": "semver@>=5.0.1 <6.0.0",
@@ -44,7 +44,7 @@
   "_shasum": "e059c09d8571f0540823733433505d3a2f00b18e",
   "_shrinkwrap": null,
   "_spec": "semver@^5.0.1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "bin": {
     "semver": "./bin/semver"
   },
@@ -83,8 +83,7 @@
   ],
   "name": "semver",
   "optionalDependencies": {},
-  "readme": "semver(1) -- The semantic versioner for npm\n===========================================\n\n## Install\n\n```bash\nnpm install --save semver\n````\n\n## Usage\n\nAs a node module:\n\n```js\nconst semver = require('semver')\n\nsemver.valid('1.2.3') // '1.2.3'\nsemver.valid('a.b.c') // null\nsemver.clean('  =v1.2.3   ') // '1.2.3'\nsemver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true\nsemver.gt('1.2.3', '9.8.7') // false\nsemver.lt('1.2.3', '9.8.7') // true\n`` [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/node-semver.git"
diff --git a/node_modules/shelljs/package.json b/node_modules/shelljs/package.json
index a6e4ca1..944ea68 100644
--- 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/steveng/repo/cordova/cordova-android"
+      "/Users/jbowser/cordova/cordova-android"
     ]
   ],
   "_from": "shelljs@>=0.5.3 <0.6.0",
@@ -37,11 +37,11 @@
     "/",
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+  "_resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
   "_shasum": "c54982b996c76ef0c1e6b59fbdc5825f5b713113",
   "_shrinkwrap": null,
   "_spec": "shelljs@^0.5.3",
-  "_where": "/Users/steveng/repo/cordova/cordova-android",
+  "_where": "/Users/jbowser/cordova/cordova-android",
   "author": {
     "name": "Artur Adib",
     "email": "arturadib@gmail.com"
@@ -85,8 +85,7 @@
   ],
   "name": "shelljs",
   "optionalDependencies": {},
-  "readme": "# ShellJS - Unix shell commands for Node.js [![Build Status](https://secure.travis-ci.org/arturadib/shelljs.png)](http://travis-ci.org/arturadib/shelljs)\n\nShellJS is a portable **(Windows/Linux/OS X)** implementation of Unix shell commands on top of the Node.js API. You can use it to eliminate your shell script's dependency on Unix while still keeping its familiar and powerful commands. You can also install it globally so you can run it from outside Node projects - say goo [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/arturadib/shelljs.git"
diff --git a/node_modules/underscore/package.json b/node_modules/underscore/package.json
index 8278605..f5f9499 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
     ]
   ],
   "_from": "underscore@>=1.8.3 <2.0.0",
@@ -35,11 +35,11 @@
   "_requiredBy": [
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+  "_resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
   "_shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022",
   "_shrinkwrap": null,
   "_spec": "underscore@^1.8.3",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "author": {
     "name": "Jeremy Ashkenas",
     "email": "jeremy@documentcloud.org"
@@ -87,8 +87,7 @@
   ],
   "name": "underscore",
   "optionalDependencies": {},
-  "readme": "                       __\n                      /\\ \\                                                         __\n     __  __    ___    \\_\\ \\     __   _ __   ____    ___    ___   _ __    __       /\\_\\    ____\n    /\\ \\/\\ \\ /' _ `\\  /'_  \\  /'__`\\/\\  __\\/ ,__\\  / ___\\ / __`\\/\\  __\\/'__`\\     \\/\\ \\  /',__\\\n    \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\  __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\  __/  __  \\ \\ \\/\\__, `\\\n     \\ \\____/ [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/jashkenas/underscore.git"
diff --git a/node_modules/unorm/package.json b/node_modules/unorm/package.json
index 283ba20..8f24064 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
     ]
   ],
   "_from": "unorm@>=1.3.3 <2.0.0",
@@ -35,11 +35,11 @@
   "_requiredBy": [
     "/cordova-common"
   ],
-  "_resolved": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
+  "_resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
   "_shasum": "364200d5f13646ca8bcd44490271335614792300",
   "_shrinkwrap": null,
   "_spec": "unorm@^1.3.3",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
   "author": {
     "name": "Bjarke Walling",
     "email": "bwp@bwp.dk"
@@ -80,7 +80,7 @@
     "node": ">= 0.4.0"
   },
   "gitHead": "e802d0d7844cf74b03742bce1147a82ace218396",
-  "homepage": "https://github.com/walling/unorm#readme",
+  "homepage": "https://github.com/walling/unorm",
   "license": "MIT or GPL-2.0",
   "main": "./lib/unorm.js",
   "maintainers": [
@@ -91,8 +91,7 @@
   ],
   "name": "unorm",
   "optionalDependencies": {},
-  "readme": "This is [Unicode Normalizer] in a Common JS module. I'm not affiliated with Matsuza, the original author of Unicode Normalizer.\n\n[![Build Status](https://travis-ci.org/walling/unorm.png?branch=master)](https://travis-ci.org/walling/unorm)\n\n\nInstallation\n------------\n\n```bash\nnpm install unorm\n```\n\nPolyfill\n--------\n\nYou can use this module as a polyfill for [String.prototype.normalize], for example:\n\n```javascript\nconsole.log('æøåäüö'.normalize('NFKD'));\n` [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/walling/unorm.git"
diff --git a/node_modules/util-deprecate/package.json b/node_modules/util-deprecate/package.json
index bccf1bb..b09616d 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/plist"
+      "/Users/jbowser/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/steveng/repo/cordova/cordova-android/node_modules/plist",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/plist",
   "author": {
     "name": "Nathan Rajlich",
     "email": "nathan@tootallnate.net",
@@ -77,8 +77,7 @@
   ],
   "name": "util-deprecate",
   "optionalDependencies": {},
-  "readme": "util-deprecate\n==============\n### The Node.js `util.deprecate()` function with browser support\n\nIn Node.js, this module simply re-exports the `util.deprecate()` function.\n\nIn the web browser (i.e. via browserify), a browser-specific implementation\nof the `util.deprecate()` function is used.\n\n\n## API\n\nA `deprecate()` function is the only thing exposed by this module.\n\n``` javascript\n// setup:\nexports.foo = deprecate(foo, 'foo() is deprecated, use bar() instead [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/TooTallNate/util-deprecate.git"
diff --git a/node_modules/wrappy/package.json b/node_modules/wrappy/package.json
index ef169d5..d83bb4f 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/inflight"
+      "/Users/jbowser/cordova/cordova-android/node_modules/inflight"
     ]
   ],
   "_from": "wrappy@>=1.0.0 <2.0.0",
@@ -41,11 +41,11 @@
     "/inflight",
     "/once"
   ],
-  "_resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+  "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
   "_shasum": "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f",
   "_shrinkwrap": null,
   "_spec": "wrappy@1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/inflight",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/inflight",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -85,8 +85,7 @@
   ],
   "name": "wrappy",
   "optionalDependencies": {},
-  "readme": "# wrappy\n\nCallback wrapping utility\n\n## USAGE\n\n```javascript\nvar wrappy = require(\"wrappy\")\n\n// var wrapper = wrappy(wrapperFunction)\n\n// make sure a cb is called only once\n// See also: http://npm.im/once for this specific use case\nvar once = wrappy(function (cb) {\n  var called = false\n  return function () {\n    if (called) return\n    called = true\n    return cb.apply(this, arguments)\n  }\n})\n\nfunction printBoo () {\n  console.log('boo')\n}\n// has som [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/npm/wrappy.git"
diff --git a/node_modules/xmlbuilder/package.json b/node_modules/xmlbuilder/package.json
index 65d8ba1..6553e48 100644
--- a/node_modules/xmlbuilder/package.json
+++ b/node_modules/xmlbuilder/package.json
@@ -10,7 +10,7 @@
         "spec": "4.0.0",
         "type": "version"
       },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/plist"
+      "/Users/jbowser/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/steveng/repo/cordova/cordova-android/node_modules/plist",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/plist",
   "author": {
     "name": "Ozgur Ozcitak",
     "email": "oozcitak@gmail.com"
@@ -83,8 +83,7 @@
   ],
   "name": "xmlbuilder",
   "optionalDependencies": {},
-  "readme": "# xmlbuilder-js\n\nAn XML builder for [node.js](https://nodejs.org/) similar to \n[java-xmlbuilder](https://github.com/jmurty/java-xmlbuilder).\n\n[![License](http://img.shields.io/npm/l/xmlbuilder.svg?style=flat-square)](http://opensource.org/licenses/MIT)\n[![NPM Version](http://img.shields.io/npm/v/xmlbuilder.svg?style=flat-square)](https://npmjs.com/package/xmlbuilder)\n[![NPM Downloads](https://img.shields.io/npm/dm/xmlbuilder.svg?style=flat-square)](https://npmjs.com/p [...]
-  "readmeFilename": "README.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/oozcitak/xmlbuilder-js.git"
diff --git a/node_modules/xmldom/package.json b/node_modules/xmldom/package.json
index 8ba5219..b6e4e7c 100644
--- 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/steveng/repo/cordova/cordova-android/node_modules/plist"
+      "/Users/jbowser/cordova/cordova-android/node_modules/plist"
     ]
   ],
   "_from": "xmldom@>=0.1.0 <0.2.0",
@@ -40,11 +40,11 @@
   "_requiredBy": [
     "/plist"
   ],
-  "_resolved": "http://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+  "_resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
   "_shasum": "d501f97b3bdb403af8ef9ecc20573187aadac0e9",
   "_shrinkwrap": null,
   "_spec": "xmldom@0.1.x",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist",
+  "_where": "/Users/jbowser/cordova/cordova-android/node_modules/plist",
   "author": {
     "name": "jindw",
     "email": "jindw@xidea.org",
@@ -106,14 +106,28 @@
   "maintainers": [
     {
       "name": "jindw",
-      "email": "jindw@xidea.org",
-      "url": "http://www.xidea.org"
+      "email": "jindw@xidea.org"
+    },
+    {
+      "name": "yaron",
+      "email": "yaronn01@gmail.com"
+    },
+    {
+      "name": "bigeasy",
+      "email": "alan@prettyrobots.com"
+    },
+    {
+      "name": "kethinov",
+      "email": "kethinov@gmail.com"
+    },
+    {
+      "name": "jinjinyun",
+      "email": "jinyun.jin@gmail.com"
     }
   ],
   "name": "xmldom",
   "optionalDependencies": {},
-  "readme": "# XMLDOM [![Build Status](https://secure.travis-ci.org/bigeasy/xmldom.png?branch=master)](http://travis-ci.org/bigeasy/xmldom) [![Coverage Status](https://coveralls.io/repos/bigeasy/xmldom/badge.png?branch=master)](https://coveralls.io/r/bigeasy/xmldom) [![NPM version](https://badge.fury.io/js/xmldom.png)](http://badge.fury.io/js/xmldom)\n\nA JavaScript implementation of W3C DOM for Node.js, Rhino and the browser. Fully\ncompatible with `W3C DOM level2`; and some compatible  [...]
-  "readmeFilename": "readme.md",
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/jindw/xmldom.git"

-- 
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org