CB-11550 Updated RELEASENOTES for release 5.2.1

CB-11550 Set VERSION to 5.2.1 (via coho)
CB-11550 Update JS snapshot to version 5.2.1 (via coho)
2026-02-21 00:02:46 +08:00 · 2016-07-11 13:43:57 +03:00 · 2016-07-11 13:43:57 +03:00 · 2016-07-11 13:43:57 +03:00 · 2016-07-11 13:41:00 +03:00 · 2016-07-11 13:11:04 +03:00
271 changed files with 3998 additions and 7635 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,22 +0,0 @@
-<!--
-Please make sure the checklist boxes are all checked before submitting the PR. The checklist
-is intended as a quick reference, for complete details please see our Contributor Guidelines:
-
-http://cordova.apache.org/contribute/contribute_guidelines.html
-
-Thanks!
-->
-
-### Platforms affected
-
-
-### What does this PR do?
-
-
-### What testing has been done on this change?
-
-
-### Checklist
- [ ] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database
- [ ] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.
- [ ] Added automated test coverage as appropriate for this change.
--- a/.gitignore
+++ b/.gitignore
@@ -40,9 +40,10 @@ Desktop.ini
 *.iml
 .idea
 npm-debug.log
+/framework/build
 node_modules/jshint
 node_modules/promise-matchers
-node_modules/jasmine
+node_modules/jasmine-node
 node_modules/rewire
 node_modules/istanbul
 node_modules/.bin/cake
@@ -53,7 +54,7 @@ node_modules/.bin/esparse
 node_modules/.bin/esvalidate
 node_modules/.bin/handlebars
 node_modules/.bin/istanbul
-node_modules/.bin/jasmine
+node_modules/.bin/jasmine-node
 node_modules/.bin/js-yaml
 node_modules/.bin/jshint
 node_modules/.bin/mkdirp
@@ -128,6 +129,4 @@ node_modules/which/
 node_modules/window-size/
 node_modules/wordwrap/
 node_modules/yargs/
-node_modules/jasmine-core/
-node_modules/fs.realpath/
 /coverage
--- a/.ratignore
+++ b/.ratignore
@@ -4,5 +4,3 @@ gen
 proguard-project.txt
 spec
 appveyor.yml
-framework/build
-ic_launcher.png
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,9 @@
 language: android
 sudo: false
-jdk:
-    - oraclejdk8
-before_install:
-    - nvm install 6
-    - node --version
-    - gradle --version
 install:
    - npm install
    - npm install -g codecov
-    - echo y | android update sdk -u --filter android-22,android-23,android-24,android-25
-android:
-    components:
-      - tools
-      - tools
+    - echo y | android update sdk -u --filter android-22,android-23
 script:
    - npm run jshint
    - npm run cover
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,120 +20,6 @@
 -->
 ## Release Notes for Cordova (Android) ##

-### 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`
-* [CB-12640](https://issues.apache.org/jira/browse/CB-12640) support for android sdk tools 26.0.1.
-
-### 6.2.2 (Apr 24, 2017)
-* [CB-12697](https://issues.apache.org/jira/browse/CB-12697) Updated checked-in `node_modules`
-
-### 6.2.1 (Apr 02, 2017)
-* [CB-12621](https://issues.apache.org/jira/browse/CB-12621) reverted elementtree dep to 0.1.6
-
-### 6.2.0 (Mar 28, 2017)
-* [CB-12614](https://issues.apache.org/jira/browse/CB-12614) Adding headers to tests
-* [CB-8978](https://issues.apache.org/jira/browse/CB-8978) Prepare copy `resource-files` from `config.xml`
-* [CB-12605](https://issues.apache.org/jira/browse/CB-12605) Fix a requirements check failure on **Windows**
-* [CB-12595](https://issues.apache.org/jira/browse/CB-12595) This should find an **Android Studio** installation and use the sweet gradle center found inside
-* [CB-12546](https://issues.apache.org/jira/browse/CB-12546) leverage `avdmanager` if `android` warns it is no longer useful, which happens in **Android SDK Tools 25.3.1**. Explicitly set the `CWD` of the spawned emulator process to workaround a recent google android sdk bug. Rename `android_sdk_version.js` to `android_sdk.js`, to better reflect its contents. Have `create.js` copy over the `android_sdk_version` batch file.
-* [CB-12524](https://issues.apache.org/jira/browse/CB-12524) Fix for missing gradle template error. This now fetches the template from inside of the **Android Studio** directory, and falls back to a locally installed Gradle instance
-* [CB-12465](https://issues.apache.org/jira/browse/CB-12465) Writing new JUnit Test Instrumentation to replace tests and retire problmatic tests
-
-### 6.1.2 (Jan 26, 2017)
-* **Security** Change to `https` by default
-* [CB-12018](https://issues.apache.org/jira/browse/CB-12018): updated tests to work with jasmine (promise matcher tests commented out for now)
-* created directories and corresponding images for `xxhdpi` and `xxxhdpi`, both drawables and `mipmaps`
-
-### 6.1.1 (Jan 03, 2017)
-* [CB-12159](https://issues.apache.org/jira/browse/CB-12159) **Android** Keystore password prompt won't show up
-* [CB-12169](https://issues.apache.org/jira/browse/CB-12169) Check for build directory before running a clean
-* Fixed `AndroidStudio` tests to actually run, removed `app/src/main/assets/` as a requirement and added `app/src/main/res` instead, added placeholder for `build/` folder, Removed dupe `gitignore`
-
-### 6.1.0 (Nov 02, 2016)
-* [CB-12108](https://issues.apache.org/jira/browse/CB-12108) Updating gradle files to work with the latest version of Android Studio
-* [CB-12102](https://issues.apache.org/jira/browse/CB-12102) Bump travis to build to API 25
-* Bumping up the version
-* [CB-12101](https://issues.apache.org/jira/browse/CB-12101) Fix so that CLI builds don't conflict with Android Studio builds
-* [CB-12077](https://issues.apache.org/jira/browse/CB-12077) Fix paths for Android icons/splashscreens
-* added framework/build to .ratignore
-* Fix for broken testUrl test
-* Last minute change of test targets
-* Update JS snapshot to version 6.1.0-dev (via coho)
-* Set VERSION to 6.1.0-dev (via coho)
-
-### 6.0.0 (Oct 20, 2016)
-
-This release adds significant functionality, and also introduces a number
-of breaking changes.  Some of the changes to the code base will be of
-particular interest to third party webview plugin developers.
-
-#### Major Changes ####
-* Primary bridge is the EVAL_BRIDGE, which tells the WebView to execute JS directly.  This is more stable than the ONLINE_EVENT bridge
-* Full Support for Android Nougat (API 24)
-* Ice Cream Sandwich Support has been deprecated.  Minimum Supported Android Version is Jellybean (API 16/ Android 4.1)
-* Plugin Installation now CLEANS the build directory, this speeds up gradle build times and allows for CLI develoment to be more predictable
-
-Changes For Third-Party WebView Developers:
-* executeJavascript method added and is an abstract method that must be implemented
-* the EVAL_BRIDGE must be added to the WebView
-
-
-#### Curated Changes from the Git Commit Logs ####
-* Updating the gradle build for test to use the latest
-* [CB-11083](https://issues.apache.org/jira/browse/CB-11083) Fixing syncronous file check and future-proofing the JS for Travis
-* [CB-11083](https://issues.apache.org/jira/browse/CB-11083) Reading files to check for CordovaLib dependency, if so, we exclude CordovaLib to be safe
-* [CB-11083](https://issues.apache.org/jira/browse/CB-11083) Plugin build script for dependencies without a gradle file
-* [CB-11083](https://issues.apache.org/jira/browse/CB-11083) The GradleBuidler can tell the difference between a Cordova Plugin Framework and a regular framework based on the name
-* [CB-11083](https://issues.apache.org/jira/browse/CB-11083) Fix to deal with custom frameworks with their own Gradle configuration
-* [CB-12003](https://issues.apache.org/jira/browse/CB-12003) updated node_modules
-* [CB-11771](https://issues.apache.org/jira/browse/CB-11771) Deep symlink directories to target project instead of linking the directory itself
-* [CB-11880](https://issues.apache.org/jira/browse/CB-11880) android: Fail-safe for cordova.exec()
-* [CB-11999](https://issues.apache.org/jira/browse/CB-11999) add message, catch exception if require fails
-* fix issue with app_name containing apostrophes
-* [CB-8722](https://issues.apache.org/jira/browse/CB-8722) - Move icons from drawable to mipmap
-* [CB-11964](https://issues.apache.org/jira/browse/CB-11964) Call clean after plugin install and mock it in tests
-* Did a try/catch to deal with the unit tests vs actual project environment, code duplication is needed because of builderEnv
-* [CB-11964](https://issues.apache.org/jira/browse/CB-11964) Do a clean when installing a plugin to et around the bug
-* [CB-11921](https://issues.apache.org/jira/browse/CB-11921) - Add github pull request template
-* [CB-11935](https://issues.apache.org/jira/browse/CB-11935) Does a best-effort attempt to pause any processing that can be paused safely, such as animations and geolocation.
-* [CB-11640](https://issues.apache.org/jira/browse/CB-11640) Fixing check_reqs.js so it actually works
-* [CB-11640](https://issues.apache.org/jira/browse/CB-11640) Changing requirements check to ask for Java 8
-* [CB-11869](https://issues.apache.org/jira/browse/CB-11869) Fix cordova-js android exec tests
-* [CB-11907](https://issues.apache.org/jira/browse/CB-11907) Bumping Gradle to work with Android Studio 2.2 and the Android Gradle Plugin
-* Enable background start of Cordova Android apps
-* fixing jshint issues
-* replace Integer.parseInt with BigInteger so that you can use longer Android version codes
-* [CB-11828](https://issues.apache.org/jira/browse/CB-11828) Adding dirty userAgent checking to see if we're running Jellybean or not for bridge modes
-* [CB-11828](https://issues.apache.org/jira/browse/CB-11828) Switching default bridge back to ONLINE_BRIDGE
-* Add gradle build flag to enable dex in process for large projects
-* added ability for cordova activity to be viewed in a real full screen regardless of android version (as was the case in previous cordova versions)
-* Updating travis
-* Adding Static Method to CoreAndroid Plugin so we can get the BuildConfig data from other plugins
-* Bump Target and Min API levels
-* Make evaluateJavaScript brige default
-* Creating an evaluateJavascript branch
-* [CB-11727](https://issues.apache.org/jira/browse/CB-11727) - travis ci setup is still using 0.10.32 node
-* [CB-11726](https://issues.apache.org/jira/browse/CB-11726) - Update appveyor node versions to 4 and 6, so they will always use the latest versions
-* Close invalid PRs
-* [CB-11683](https://issues.apache.org/jira/browse/CB-11683) Fixed linking to directories during plugin installation.
-* fixed [CB-11078](https://issues.apache.org/jira/browse/CB-11078) Empty string for BackgroundColor preference crashes application This closes #316
-* Update JS snapshot to version 5.3.0-dev (via coho)
-* Set VERSION to 5.3.0-dev (via coho)
-* [CB-11626](https://issues.apache.org/jira/browse/CB-11626) Updated RELEASENOTES and Version for release 5.2.2
-* updated cordoova-common to 1.4.0
-* This closes #195
-* Updaing the gradle for the tests to the latest
-* [CB-11550](https://issues.apache.org/jira/browse/CB-11550) Updated RELEASENOTES for release 5.2.1
-* [CB-9489](https://issues.apache.org/jira/browse/CB-9489) Fixed "endless waiting for emulator" issue
-* Update JS snapshot to version 5.3.0-dev (via coho)
-* Set VERSION to 5.3.0-dev (via coho)
-* [CB-11444](https://issues.apache.org/jira/browse/CB-11444) Updated RELEASENOTES and Version for release 5.2.0
-* [CB-11481](https://issues.apache.org/jira/browse/CB-11481) android-library is deprecated use com.android.library instead
-
-### 5.2.2 (Jul 26, 2016)
-* [CB-11615](https://issues.apache.org/jira/browse/CB-11615) updated `cordoova-common` to `1.4.0`
-
 ### 5.2.1 (Jul 11, 2016)
 * [CB-9489](https://issues.apache.org/jira/browse/CB-9489) Fixed "endless waiting for emulator" issue
 * [CB-11481](https://issues.apache.org/jira/browse/CB-11481) android-library is deprecated use com.android.library instead
--- a/2
+++ b/2
@@ -1 +1 @@
-6.2.3
+5.2.1
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,8 +2,7 @@ environment:
  matrix:
  - nodejs_version: "0.10"
  - nodejs_version: "0.12"
-  - nodejs_version: "4"
-  - nodejs_version: "6"
+  - nodejs_version: "4.2"

 install:
 #   - cinst android-sdk
--- a/bin/android_sdk_version
+++ b/bin/android_sdk_version
@@ -19,10 +19,10 @@
       under the License.
 */

-var android_sdk = require('./templates/cordova/lib/android_sdk');
+var android_sdk_version = require('./lib/android_sdk_version');

-android_sdk.print_newest_available_sdk_target().done(null, function(err) {
-    console.error(err);
+android_sdk_version.run().done(null, function(err) {
+    console.log(err);
    process.exit(2);
 });

--- a/bin/check_reqs
+++ b/bin/check_reqs
@@ -19,7 +19,7 @@
       under the License.
 */

-var check_reqs = require('./templates/cordova/lib/check_reqs');
+var check_reqs = require('./lib/check_reqs');

 check_reqs.run().done(
    function success() {
--- a/bin/lib/android_sdk_version.js
+++ b/bin/lib/android_sdk_version.js
@@ -0,0 +1,64 @@
+#!/usr/bin/env node
+
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       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
+       KIND, either express or implied.  See the License for the
+       specific language governing permissions and limitations
+       under the License.
+*/
+
+var child_process = require('child_process'),
+    Q     = require('q');
+
+var get_highest_sdk = function(results){
+    var reg = /\d+/;
+    var apiLevels = [];
+    for(var i=0;i<results.length;i++){
+        apiLevels[i] = parseInt(results[i].match(reg)[0]);
+    }
+    apiLevels.sort(function(a,b){return b-a;});
+    console.log(apiLevels[0]);
+};
+
+var get_sdks = function() {
+    var d = Q.defer();
+    child_process.exec('android list targets', function(err, stdout, stderr) {
+        if (err) d.reject(stderr);
+        else d.resolve(stdout);
+    });
+
+    return d.promise.then(function(output) {
+        var reg = /android-\d+/gi;
+        var results = output.match(reg);
+        if(results.length===0){
+            return Q.reject(new Error('No android sdks installed.'));
+        }else{
+            get_highest_sdk(results);
+        }
+
+        return Q();
+    }, function(stderr) {
+        if (stderr.match(/command\snot\sfound/) || stderr.match(/'android' is not recognized/)) {
+            return Q.reject(new Error('The command \"android\" failed. Make sure you have the latest Android SDK installed, and the \"android\" command (inside the tools/ folder) is added to your path.'));
+        } else {
+            return Q.reject(new Error('An error occurred while listing Android targets'));
+        }
+    });
+};
+
+module.exports.run = function() {
+    return Q.all([get_sdks()]);
+};
+
--- a/bin/templates/cordova/lib/check_reqs.js
+++ b/bin/templates/cordova/lib/check_reqs.js
@@ -26,12 +26,10 @@ var shelljs = require('shelljs'),
    Q     = require('q'),
    path  = require('path'),
    fs    = require('fs'),
-    os    = require('os'),
-    REPO_ROOT  = path.join(__dirname, '..', '..', '..', '..'),
-    PROJECT_ROOT = path.join(__dirname, '..', '..');
+    ROOT  = path.join(__dirname, '..', '..');
 var CordovaError = require('cordova-common').CordovaError;
-var superspawn = require('cordova-common').superspawn;
-var android_sdk = require('./android_sdk');
+
+var isWindows = process.platform == 'win32';

 function forgivingWhichSync(cmd) {
    try {
@@ -52,16 +50,7 @@ function tryCommand(cmd, errMsg, catchStderr) {
    return d.promise;
 }

-module.exports.isWindows = function() {
-    return (os.platform() == 'win32');
-};
-
-module.exports.isDarwin = function() {
-    return (os.platform() == 'darwin');
-};
-
-// Get valid target from framework/project.properties if run from this repo
-// Otherwise get target from project.properties file within a generated cordova-android project
+// Get valid target from framework/project.properties
 module.exports.get_target = function() {
    function extractFromFile(filePath) {
        var target = shelljs.grep(/\btarget=/, filePath);
@@ -70,83 +59,38 @@ module.exports.get_target = function() {
        }
        return target.split('=')[1].trim();
    }
-    var repo_file = path.join(REPO_ROOT, 'framework', 'project.properties');
-    if (fs.existsSync(repo_file)) {
-        return extractFromFile(repo_file);
+    if (fs.existsSync(path.join(ROOT, 'framework', 'project.properties'))) {
+        return extractFromFile(path.join(ROOT, 'framework', 'project.properties'));
    }
-    var project_file = path.join(PROJECT_ROOT, 'project.properties');
-    if (fs.existsSync(project_file)) {
-        // if no target found, we're probably in a project and project.properties is in PROJECT_ROOT.
-        return extractFromFile(project_file);
+    if (fs.existsSync(path.join(ROOT, 'project.properties'))) {
+        // if no target found, we're probably in a project and project.properties is in ROOT.
+        return extractFromFile(path.join(ROOT, 'project.properties'));
    }
-    throw new Error('Could not find android target in either ' + repo_file + ' nor ' + project_file);
+    throw new Error('Could not find android target. File missing: ' + path.join(ROOT, 'project.properties'));
 };

 // Returns a promise. Called only by build and clean commands.
 module.exports.check_ant = function() {
-    return superspawn.spawn('ant', ['-version'])
-    .then(function(output) {
+    return tryCommand('ant -version', 'Failed to run "ant -version", make sure you have ant installed and added to your PATH.')
+    .then(function (output) {
        // Parse Ant version from command output
        return /version ((?:\d+\.)+(?:\d+))/i.exec(output)[1];
-    }).catch(function(err) {
-        throw new CordovaError('Failed to run `ant -version`. Make sure you have `ant` on your $PATH.');
    });
 };

-module.exports.get_gradle_wrapper = function() {
-    var androidStudioPath;
-    var i = 0;
-    var foundStudio = false;
-    var program_dir;
-    if (module.exports.isDarwin()) {
-        program_dir = fs.readdirSync('/Applications');
-        while (i < program_dir.length && !foundStudio) {
-            if (program_dir[i].startsWith('Android Studio')) {
-                //TODO: Check for a specific Android Studio version, make sure it's not Canary
-                androidStudioPath = path.join('/Applications', program_dir[i], 'Contents', 'gradle');
-                foundStudio = true;
-            } else { ++i; }
-        }
-    } else if (module.exports.isWindows()) {
-        var androidPath = path.join(process.env['ProgramFiles'], 'Android') + '/';
-        if (fs.existsSync(androidPath)) {
-            program_dir = fs.readdirSync(androidPath);
-            while (i < program_dir.length && !foundStudio) {
-                if (program_dir[i].startsWith('Android Studio')) {
-                    foundStudio = true;
-                    androidStudioPath = path.join(process.env['ProgramFiles'], 'Android', program_dir[i], 'gradle');
-                } else { ++i; }
-            }
-        }
-    }
-
-    if (androidStudioPath !== null && fs.existsSync(androidStudioPath)) {
-        var dirs = fs.readdirSync(androidStudioPath);
-        if(dirs[0].split('-')[0] == 'gradle') {
-            return path.join(androidStudioPath, dirs[0], 'bin', 'gradle');
-        }
-    } else {
-        //OK, let's try to check for Gradle!
-        return forgivingWhichSync('gradle');
-    }
-};
-
 // Returns a promise. Called only by build and clean commands.
 module.exports.check_gradle = function() {
    var sdkDir = process.env['ANDROID_HOME'];
-    var d = Q.defer();
    if (!sdkDir)
        return Q.reject(new CordovaError('Could not find gradle wrapper within Android SDK. Could not find Android SDK directory.\n' +
            'Might need to install Android SDK or set up \'ANDROID_HOME\' env variable.'));

-    var gradlePath = module.exports.get_gradle_wrapper();
-    if (gradlePath.length !== 0)
-        d.resolve(gradlePath);
-    else
-        d.reject(new CordovaError('Could not find an installed version of Gradle either in Android Studio,\n' +
-                                'or on your system to install the gradle wrapper. Please include gradle \n' +
-                                'in your path, or install Android Studio'));
-    return d.promise;
+    var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
+    if (!fs.existsSync(wrapperDir)) {
+        return Q.reject(new CordovaError('Could not find gradle wrapper within Android SDK. Might need to update your Android SDK.\n' +
+            'Looked here: ' + wrapperDir));
+    }
+    return Q.when();
 };

 // Returns a promise.
@@ -161,15 +105,12 @@ module.exports.check_java = function() {
            }
        } else {
            if (javacPath) {
+                var msg = 'Failed to find \'JAVA_HOME\' environment variable. Try setting setting it manually.';
                // OS X has a command for finding JAVA_HOME.
-                var find_java = '/usr/libexec/java_home';
-                var default_java_error_msg = 'Failed to find \'JAVA_HOME\' environment variable. Try setting setting it manually.';
-                if (fs.existsSync(find_java)) {
-                    return superspawn.spawn(find_java)
+                if (fs.existsSync('/usr/libexec/java_home')) {
+                    return tryCommand('/usr/libexec/java_home', msg)
                    .then(function(stdout) {
                        process.env['JAVA_HOME'] = stdout.trim();
-                    }).catch(function(err) {
-                        throw new CordovaError(default_java_error_msg);
                    });
                } else {
                    // See if we can derive it from javac's location.
@@ -178,10 +119,10 @@ module.exports.check_java = function() {
                    if (fs.existsSync(path.join(maybeJavaHome, 'lib', 'tools.jar'))) {
                        process.env['JAVA_HOME'] = maybeJavaHome;
                    } else {
-                        throw new CordovaError(default_java_error_msg);
+                        throw new CordovaError(msg);
                    }
                }
-            } else if (module.exports.isWindows()) {
+            } else if (isWindows) {
                // Try to auto-detect java in the default install paths.
                var oldSilent = shelljs.config.silent;
                shelljs.config.silent = true;
@@ -201,29 +142,27 @@ module.exports.check_java = function() {
            }
        }
    }).then(function() {
-        var msg =
-            'Failed to run "javac -version", make sure that you have a JDK installed.\n' +
-            'You can get it from: http://www.oracle.com/technetwork/java/javase/downloads.\n';
-        if (process.env['JAVA_HOME']) {
-            msg += 'Your JAVA_HOME is invalid: ' + process.env['JAVA_HOME'] + '\n';
-        }
-        // We use tryCommand with catchStderr = true, because
-        // javac writes version info to stderr instead of stdout
-        return tryCommand('javac -version', msg, true)
-        .then(function (output) {
-            //Let's check for at least Java 8, and keep it future proof so we can support Java 10
-            var match = /javac ((?:1\.)(?:[8-9]\.)(?:\d+))|((?:1\.)(?:[1-9]\d+\.)(?:\d+))/i.exec(output);
-            return match && match[1];
+            var msg =
+                'Failed to run "javac -version", make sure that you have a JDK installed.\n' +
+                'You can get it from: http://www.oracle.com/technetwork/java/javase/downloads.\n';
+            if (process.env['JAVA_HOME']) {
+                msg += 'Your JAVA_HOME is invalid: ' + process.env['JAVA_HOME'] + '\n';
+            }
+            // We use tryCommand with catchStderr = true, because
+            // javac writes version info to stderr instead of stdout
+            return tryCommand('javac -version', msg, true)
+                .then(function (output) {
+                    var match = /javac ((?:\d+\.)+(?:\d+))/i.exec(output);
+                    return match && match[1];
+                });
        });
-    });
 };

 // Returns a promise.
 module.exports.check_android = function() {
    return Q().then(function() {
        var androidCmdPath = forgivingWhichSync('android');
-        var adbInPath = forgivingWhichSync('adb');
-        var avdmanagerInPath = forgivingWhichSync('avdmanager');
+        var adbInPath = !!forgivingWhichSync('adb');
        var hasAndroidHome = !!process.env['ANDROID_HOME'] && fs.existsSync(process.env['ANDROID_HOME']);
        function maybeSetAndroidHome(value) {
            if (!hasAndroidHome && fs.existsSync(value)) {
@@ -231,10 +170,8 @@ module.exports.check_android = function() {
                process.env['ANDROID_HOME'] = value;
            }
        }
-        // First ensure ANDROID_HOME is set
-        // If we have no hints (nothing in PATH), try a few default locations
-        if (!hasAndroidHome && !androidCmdPath && !adbInPath && !avdmanagerInPath) {
-            if (module.exports.isWindows()) {
+        if (!hasAndroidHome && !androidCmdPath) {
+            if (isWindows) {
                // Android Studio 1.0 installer
                maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'sdk'));
                maybeSetAndroidHome(path.join(process.env['ProgramFiles'], 'Android', 'sdk'));
@@ -244,7 +181,7 @@ module.exports.check_android = function() {
                // Stand-alone installer
                maybeSetAndroidHome(path.join(process.env['LOCALAPPDATA'], 'Android', 'android-sdk'));
                maybeSetAndroidHome(path.join(process.env['ProgramFiles'], 'Android', 'android-sdk'));
-            } else if (module.exports.isDarwin()) {
+            } else if (process.platform == 'darwin') {
                // Android Studio 1.0 installer
                maybeSetAndroidHome(path.join(process.env['HOME'], 'Library', 'Android', 'sdk'));
                // Android Studio pre-1.0 installer
@@ -259,43 +196,27 @@ module.exports.check_android = function() {
                maybeSetAndroidHome(path.join(process.env['HOME'], 'android-sdk'));
            }
        }
-        if (!hasAndroidHome) {
-            // If we dont have ANDROID_HOME, but we do have some tools on the PATH, try to infer from the tooling PATH.
-            var parentDir, grandParentDir;
-            if (androidCmdPath) {
-                parentDir = path.dirname(androidCmdPath);
-                grandParentDir = path.dirname(parentDir);
-                if (path.basename(parentDir) == 'tools' || fs.existsSync(path.join(grandParentDir, 'tools', 'android'))) {
-                    maybeSetAndroidHome(grandParentDir);
-                } else {
-                    throw new CordovaError('Failed to find \'ANDROID_HOME\' environment variable. Try setting setting it manually.\n' +
-                        'Detected \'android\' command at ' + parentDir + ' but no \'tools\' directory found near.\n' +
-                        'Try reinstall Android SDK or update your PATH to include valid path to SDK' + path.sep + 'tools directory.');
-                }
-            }
-            if (adbInPath) {
-                parentDir = path.dirname(adbInPath);
-                grandParentDir = path.dirname(parentDir);
-                if (path.basename(parentDir) == 'platform-tools') {
-                    maybeSetAndroidHome(grandParentDir);
-                } else {
-                    throw new CordovaError('Failed to find \'ANDROID_HOME\' environment variable. Try setting setting it manually.\n' +
-                        'Detected \'adb\' command at ' + parentDir + ' but no \'platform-tools\' directory found near.\n' +
-                        'Try reinstall Android SDK or update your PATH to include valid path to SDK' + path.sep + 'platform-tools directory.');
-                }
-            }
-            if (avdmanagerInPath) {
-                parentDir = path.dirname(avdmanagerInPath);
-                grandParentDir = path.dirname(parentDir);
-                if (path.basename(parentDir) == 'bin' && path.basename(grandParentDir) == 'tools') {
-                    maybeSetAndroidHome(path.dirname(grandParentDir));
-                } else {
-                    throw new CordovaError('Failed to find \'ANDROID_HOME\' environment variable. Try setting setting it manually.\n' +
-                        'Detected \'avdmanager\' command at ' + parentDir + ' but no \'tools' + path.sep + 'bin\' directory found near.\n' +
-                        'Try reinstall Android SDK or update your PATH to include valid path to SDK' + path.sep + 'tools' + path.sep + 'bin directory.');
-                }
+        if (hasAndroidHome && !androidCmdPath) {
+            process.env['PATH'] += path.delimiter + path.join(process.env['ANDROID_HOME'], 'tools');
+        }
+        if (androidCmdPath && !hasAndroidHome) {
+            var parentDir = path.dirname(androidCmdPath);
+            var grandParentDir = path.dirname(parentDir);
+            if (path.basename(parentDir) == 'tools') {
+                process.env['ANDROID_HOME'] = path.dirname(parentDir);
+                hasAndroidHome = true;
+            } else if (fs.existsSync(path.join(grandParentDir, 'tools', 'android'))) {
+                process.env['ANDROID_HOME'] = grandParentDir;
+                hasAndroidHome = true;
+            } else {
+                throw new CordovaError('Failed to find \'ANDROID_HOME\' environment variable. Try setting setting it manually.\n' +
+                    'Detected \'android\' command at ' + parentDir + ' but no \'tools\' directory found near.\n' +
+                    'Try reinstall Android SDK or update your PATH to include path to valid SDK directory.');
            }
        }
+        if (hasAndroidHome && !adbInPath) {
+            process.env['PATH'] += path.delimiter + path.join(process.env['ANDROID_HOME'], 'platform-tools');
+        }
        if (!process.env['ANDROID_HOME']) {
            throw new CordovaError('Failed to find \'ANDROID_HOME\' environment variable. Try setting setting it manually.\n' +
                'Failed to find \'android\' command in your \'PATH\'. Try update your \'PATH\' to include path to valid SDK directory.');
@@ -304,27 +225,12 @@ module.exports.check_android = function() {
            throw new CordovaError('\'ANDROID_HOME\' environment variable is set to non-existent path: ' + process.env['ANDROID_HOME'] +
                '\nTry update it manually to point to valid SDK directory.');
        }
-        // Next let's make sure relevant parts of the SDK tooling is in our PATH
-        if (hasAndroidHome && !androidCmdPath) {
-            process.env['PATH'] += path.delimiter + path.join(process.env['ANDROID_HOME'], 'tools');
-        }
-        if (hasAndroidHome && !adbInPath) {
-            process.env['PATH'] += path.delimiter + path.join(process.env['ANDROID_HOME'], 'platform-tools');
-        }
-        if (hasAndroidHome && !avdmanagerInPath) {
-            process.env['PATH'] += path.delimiter + path.join(process.env['ANDROID_HOME'], 'tools', 'bin');
-        }
-        return hasAndroidHome;
    });
 };

-// TODO: is this actually needed?
 module.exports.getAbsoluteAndroidCmd = function () {
    var cmd = forgivingWhichSync('android');
-    if (cmd.length === 0) {
-        cmd = forgivingWhichSync('sdkmanager');
-    }
-    if (module.exports.isWindows()) {
+    if (process.platform === 'win32') {
        return '"' + cmd + '"';
    }
    return cmd.replace(/(\s)/g, '\\$1');
@@ -336,17 +242,20 @@ module.exports.check_android_target = function(originalError) {
    //   android-L
    //   Google Inc.:Google APIs:20
    //   Google Inc.:Glass Development Kit Preview:20
-    var desired_api_level = module.exports.get_target();
-    return android_sdk.list_targets()
-    .then(function(targets) {
-        if (targets.indexOf(desired_api_level) >= 0) {
+    var valid_target = module.exports.get_target();
+    var msg = 'Android SDK not found. Make sure that it is installed. If it is not at the default location, set the ANDROID_HOME environment variable.';
+    return tryCommand('android list targets --compact', msg)
+    .then(function(output) {
+        var targets = output.split('\n');
+        if (targets.indexOf(valid_target) >= 0) {
            return targets;
        }
+
        var androidCmd = module.exports.getAbsoluteAndroidCmd();
-        var msg = 'Please install Android target / API level: "' + desired_api_level  + '".\n\n' +
+        var msg = 'Please install Android target: "' + valid_target + '".\n\n' +
            'Hint: Open the SDK manager by running: ' + androidCmd + '\n' +
            'You will require:\n' +
-            '1. "SDK Platform" for API level ' + desired_api_level + '\n' +
+            '1. "SDK Platform" for ' + valid_target + '\n' +
            '2. "Android SDK Platform-tools (latest)\n' +
            '3. "Android SDK Build-tools" (latest)';
        if (originalError) {
@@ -358,22 +267,13 @@ module.exports.check_android_target = function(originalError) {

 // Returns a promise.
 module.exports.run = function() {
-     return Q.all([this.check_java(), this.check_android()])
-     .then(function(values) {
-         console.log('ANDROID_HOME=' + process.env['ANDROID_HOME']);
-         console.log('JAVA_HOME=' + process.env['JAVA_HOME']);
-
-         if (!values[0]) {
-            throw new CordovaError('Requirements check failed for JDK 1.8 or greater');
-         }
-
-         if (!values[1]) {
-            throw new CordovaError('Requirements check failed for Android SDK');
-         }
-     });
+    return Q.all([this.check_java(), this.check_android()])
+    .then(function() {
+        console.log('ANDROID_HOME=' + process.env['ANDROID_HOME']);
+        console.log('JAVA_HOME=' + process.env['JAVA_HOME']);
+    });
 };

-
 /**
 * Object thar represents one of requirements for current platform.
 * @param {String} id         The unique identifier for this requirements.
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -23,10 +23,10 @@ var shell = require('shelljs'),
    Q     = require('q'),
    path  = require('path'),
    fs    = require('fs'),
-    check_reqs = require('./../templates/cordova/lib/check_reqs'),
+    check_reqs = require('./check_reqs'),
    ROOT    = path.join(__dirname, '..', '..');

-var MIN_SDK_VERSION = 16;
+var MIN_SDK_VERSION = 14;

 var CordovaError = require('cordova-common').CordovaError;
 var AndroidManifest = require('../templates/cordova/lib/AndroidManifest');
@@ -134,29 +134,20 @@ function copyBuildRules(projectPath) {
    var srcDir = path.join(ROOT, 'bin', 'templates', 'project');

    shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
-    shell.cp('-f', path.join(srcDir, 'wrapper.gradle'), projectPath);
 }

 function copyScripts(projectPath) {
-    var bin = path.join(ROOT, 'bin');
-    var srcScriptsDir = path.join(bin, 'templates', 'cordova');
+    var srcScriptsDir = path.join(ROOT, 'bin', 'templates', 'cordova');
    var destScriptsDir = path.join(projectPath, 'cordova');
    // Delete old scripts directory if this is an update.
    shell.rm('-rf', destScriptsDir);
    // Copy in the new ones.
    shell.cp('-r', srcScriptsDir, projectPath);
    shell.cp('-r', path.join(ROOT, 'node_modules'), destScriptsDir);
-    shell.cp(path.join(bin, 'check_reqs*'), destScriptsDir);
-    shell.cp(path.join(bin, 'android_sdk_version*'), destScriptsDir);
-    var check_reqs = path.join(destScriptsDir, 'check_reqs');
-    var android_sdk_version = path.join(destScriptsDir, 'android_sdk_version');
-    // TODO: the two files being edited on-the-fly here are shared between
-    // platform and project-level commands. the below `sed` is updating the
-    // `require` path for the two libraries. if there's a better way to share
-    // modules across both the repo and generated projects, we should make sure
-    // to remove/update this.
-    shell.sed('-i', /templates\/cordova\//, '', android_sdk_version);
-    shell.sed('-i', /templates\/cordova\//, '', check_reqs);
+    shell.cp(path.join(ROOT, 'bin', 'check_reqs*'), destScriptsDir);
+    shell.cp(path.join(ROOT, 'bin', 'lib', 'check_reqs.js'), path.join(projectPath, 'cordova', 'lib', 'check_reqs.js'));
+    shell.cp(path.join(ROOT, 'bin', 'android_sdk_version'), path.join(destScriptsDir, 'android_sdk_version'));
+    shell.cp(path.join(ROOT, 'bin', 'lib', 'android_sdk_version.js'), path.join(projectPath, 'cordova', 'lib', 'android_sdk_version.js'));
 }

 /**
--- a/bin/templates/cordova/Api.js
+++ b/bin/templates/cordova/Api.js
@@ -18,10 +18,8 @@
 */

 var path = require('path');
-var Q = require('q');

 var AndroidProject = require('./lib/AndroidProject');
-var AndroidStudio = require('./lib/AndroidStudio');
 var PluginManager = require('cordova-common').PluginManager;

 var CordovaLogger = require('cordova-common').CordovaLogger;
@@ -29,7 +27,6 @@ var selfEvents = require('cordova-common').events;

 var PLATFORM = 'android';

-
 function setupEvents(externalEventEmitter) {
    if (externalEventEmitter) {
        // This will make the platform internal events visible outside
@@ -43,7 +40,6 @@ function setupEvents(externalEventEmitter) {
    return selfEvents;
 }

-
 /**
 * Class, that acts as abstraction over particular platform. Encapsulates the
 *   platform's properties and methods.
@@ -66,28 +62,15 @@ function Api(platform, platformRootDir, events) {
    this.locations = {
        root: self.root,
        www: path.join(self.root, 'assets/www'),
-        res: path.join(self.root, 'res'),
        platformWww: path.join(self.root, 'platform_www'),
        configXml: path.join(self.root, 'res/xml/config.xml'),
        defaultConfigXml: path.join(self.root, 'cordova/defaults.xml'),
        strings: path.join(self.root, 'res/values/strings.xml'),
        manifest: path.join(self.root, 'AndroidManifest.xml'),
-        build: path.join(self.root, 'build'),
        // NOTE: Due to platformApi spec we need to return relative paths here
        cordovaJs: 'bin/templates/project/assets/www/cordova.js',
        cordovaJsSrc: 'cordova-js-src'
    };
-
-    // XXX Override some locations for Android Studio projects
-    if(AndroidStudio.isAndroidStudioProject(self.root) === true) {
-      selfEvents.emit('log', 'Android Studio project detected');
-      this.android_studio = true;
-      this.locations.configXml = path.join(self.root, 'app/src/main/res/xml/config.xml');
-      this.locations.strings = path.join(self.root, 'app/src/main/res/xml/strings.xml');
-      this.locations.manifest = path.join(self.root, 'app/src/main/AndroidManifest.xml');
-      this.locations.www = path.join(self.root, 'app/src/main/assets/www');
-      this.locations.res = path.join(self.root, 'app/src/main/res');
-    }
 }

 /**
@@ -110,20 +93,13 @@ function Api(platform, platformRootDir, events) {
 */
 Api.createPlatform = function (destination, config, options, events) {
    events = setupEvents(events);
-    var result;
-    try {
-        result = require('../../lib/create')
-        .create(destination, config, options, events)
-        .then(function (destination) {
-            var PlatformApi = require(path.resolve(destination, 'cordova/Api'));
-            return new PlatformApi(PLATFORM, destination, events);
-        });
-    }
-    catch (e) {
-        events.emit('error','createPlatform is not callable from the android project API.');
-        throw(e);
-    }
-    return result;
+
+    return require('../../lib/create')
+    .create(destination, config, options, events)
+    .then(function (destination) {
+        var PlatformApi = require(path.resolve(destination, 'cordova/Api'));
+        return new PlatformApi(PLATFORM, destination, events);
+    });
 };

 /**
@@ -144,20 +120,13 @@ Api.createPlatform = function (destination, config, options, events) {
 */
 Api.updatePlatform = function (destination, options, events) {
    events = setupEvents(events);
-    var result;
-    try {
-        result = require('../../lib/create')
-        .update(destination, options, events)
-        .then(function (destination) {
-            var PlatformApi = require(path.resolve(destination, 'cordova/Api'));
-            return new PlatformApi('android', destination, events);
-        });
-    }
-    catch (e) {
-        events.emit('error','updatePlatform is not callable from the android project API, you will need to do this manually.');
-        throw(e);
-    }
-    return result;
+
+    return require('../../lib/create')
+    .update(destination, options, events)
+    .then(function (destination) {
+        var PlatformApi = require(path.resolve(destination, 'cordova/Api'));
+        return new PlatformApi('android', destination, events);
+    });
 };

 /**
@@ -217,7 +186,6 @@ Api.prototype.prepare = function (cordovaProject, prepareOptions) {
 */
 Api.prototype.addPlugin = function (plugin, installOptions) {
    var project = AndroidProject.getProjectFile(this.root);
-    var self = this;

    installOptions = installOptions || {};
    installOptions.variables = installOptions.variables || {};
@@ -226,40 +194,15 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
        installOptions.variables.PACKAGE_NAME = project.getPackageName();
    }

-    if(this.android_studio === true) {
-      installOptions.android_studio = true;
-    }
-
-    return Q()
-       .then(function () {
-            //CB-11964: Do a clean when installing the plugin code to get around
-            //the Gradle bug introduced by the Android Gradle Plugin Version 2.2
-            //TODO: Delete when the next version of Android Gradle plugin comes out
-
-           // Since clean doesn't just clean the build, it also wipes out www, we need
-           // to pass additional options.
-
-           // Do some basic argument parsing
-            var opts = {};
-
-             // Skip cleaning prepared files when not invoking via cordova CLI.
-            opts.noPrepare = true;
-
-            if(!AndroidStudio.isAndroidStudioProject(self.root) && !project.isClean()) {
-              return self.clean(opts);
-            }
-        })
-       .then(function () {
-            return PluginManager.get(self.platform, self.locations, project)
-                .addPlugin(plugin, installOptions);
-        })
-      .then(function () {
+    return PluginManager.get(this.platform, this.locations, project)
+        .addPlugin(plugin, installOptions)
+        .then(function () {
            if (plugin.getFrameworks(this.platform).length === 0) return;

            selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>');
            require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles();
        }.bind(this))
-       // CB-11022 Return truthy value to prevent running prepare after
+        // CB-11022 Return truthy value to prevent running prepare after
        .thenResolve(true);
 };

@@ -278,12 +221,6 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
 */
 Api.prototype.removePlugin = function (plugin, uninstallOptions) {
    var project = AndroidProject.getProjectFile(this.root);
-
-    if(uninstallOptions && uninstallOptions.usePlatformWww === true && this.android_studio === true) {
-      uninstallOptions.usePlatformWww = false;
-      uninstallOptions.android_studio = true;
-    }
-
    return PluginManager.get(this.platform, this.locations, project)
        .removePlugin(plugin, uninstallOptions)
        .then(function () {
@@ -381,8 +318,7 @@ Api.prototype.run = function(runOptions) {
 };

 /**
- * Cleans out the build artifacts from platform's directory, and also
- * cleans out the platform www directory if called without options specified.
+ * Cleans out the build artifacts from platform's directory.
 *
 * @return  {Promise}  Return a promise either fulfilled, or rejected with
 *   CordovaError.
@@ -390,16 +326,14 @@ Api.prototype.run = function(runOptions) {
 Api.prototype.clean = function(cleanOptions) {
    var self = this;
    return require('./lib/check_reqs').run()
-      .then(function () {
-          return require('./lib/build').runClean.call(self, cleanOptions);
-      })
-      .then(function () {
-          return require('./lib/prepare').clean.call(self, cleanOptions);
-      });
+    .then(function () {
+        return require('./lib/build').runClean.call(self, cleanOptions);
+    })
+    .then(function () {
+        return require('./lib/prepare').clean.call(self, cleanOptions);
+    });
 };

-
-
 /**
 * Performs a requirements check for current platform. Each platform defines its
 *   own set of requirements, which should be resolved before platform can be
--- a/bin/templates/cordova/lib/AndroidProject.js
+++ b/bin/templates/cordova/lib/AndroidProject.js
@@ -21,7 +21,6 @@ var fs = require('fs');
 var path = require('path');
 var properties_parser = require('properties-parser');
 var AndroidManifest = require('./AndroidManifest');
-var AndroidStudio = require('./AndroidStudio');
 var pluginHandlers = require('./pluginHandlers');

 var projectFileCache = {};
@@ -64,9 +63,6 @@ function AndroidProject(projectDir) {
    this.projectDir = projectDir;
    this.platformWww = path.join(this.projectDir, 'platform_www');
    this.www = path.join(this.projectDir, 'assets/www');
-    if(AndroidStudio.isAndroidStudioProject(projectDir) === true) {
-      this.www = path.join(this.projectDir, 'app/src/main/assets/www');
-    }
 }

 AndroidProject.getProjectFile = function (projectDir) {
@@ -93,11 +89,7 @@ AndroidProject.purgeCache = function (projectDir) {
 * @return  {String}              The name of the package
 */
 AndroidProject.prototype.getPackageName = function() {
-    var manifestPath = path.join(this.projectDir, 'AndroidManifest.xml');
-    if(AndroidStudio.isAndroidStudioProject(this.projectDir) === true) {
-      manifestPath = path.join(this.projectDir, 'app/src/main/AndroidManifest.xml');
-    }
-    return new AndroidManifest(manifestPath).getPackageId();
+    return new AndroidManifest(path.join(this.projectDir, 'AndroidManifest.xml')).getPackageId();
 };

 AndroidProject.prototype.getCustomSubprojectRelativeDir = function(plugin_id, src) {
@@ -197,14 +189,5 @@ AndroidProject.prototype.getUninstaller = function (type) {
    return pluginHandlers.getUninstaller(type);
 };

-/*
- * This checks if an Android project is clean or has old build artifacts
- */
-
-AndroidProject.prototype.isClean = function() {
-    var build_path = path.join(this.projectDir, 'build');
-    //If the build directory doesn't exist, it's clean
-    return !(fs.existsSync(build_path));
-};

 module.exports = AndroidProject;
--- a/bin/templates/cordova/lib/AndroidStudio.js
+++ b/bin/templates/cordova/lib/AndroidStudio.js
@@ -1,42 +0,0 @@
-/*
- *  This is a simple routine that checks if project is an Android Studio Project
- *
- *  @param {String} root Root folder of the project
- */
-
-/*jshint esnext: false */
-
-var path = require('path');
-var fs = require('fs');
-var CordovaError = require('cordova-common').CordovaError;
-
-module.exports.isAndroidStudioProject = function isAndroidStudioProject(root) {
-    var eclipseFiles = ['AndroidManifest.xml', 'libs', 'res', 'project.properties', 'platform_www'];
-    var androidStudioFiles = ['app', 'gradle', 'app/src/main/res'];
-
-    // assume it is an AS project and not an Eclipse project
-    var isEclipse = false;
-    var isAS = true;
-
-    if(!fs.existsSync(root)) {
-        throw new CordovaError('AndroidStudio.js:inAndroidStudioProject root does not exist: ' + root);
-    }
-
-    // if any of the following exists, then we are not an ASProj
-    eclipseFiles.forEach(function(file) {
-        if(fs.existsSync(path.join(root, file))) {
-            isEclipse = true;
-        }
-    });
-
-    // if it is NOT an eclipse project, check that all required files exist
-    if(!isEclipse) {
-        androidStudioFiles.forEach(function(file){
-            if(!fs.existsSync(path.join(root, file))) {
-                console.log('missing file :: ' + file);
-                isAS = false;
-            }
-        });
-    }
-    return (!isEclipse && isAS);
-};
--- a/bin/templates/cordova/lib/android_sdk.js
+++ b/bin/templates/cordova/lib/android_sdk.js
@@ -1,106 +0,0 @@
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       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
-       KIND, either express or implied.  See the License for the
-       specific language governing permissions and limitations
-       under the License.
-*/
-
-var Q = require('q'),
-    superspawn = require('cordova-common').superspawn;
-
-var suffix_number_regex = /(\d+)$/;
-// Used for sorting Android targets, example strings to sort:
-//   android-19
-//   android-L
-//   Google Inc.:Google APIs:20
-//   Google Inc.:Glass Development Kit Preview:20
-// The idea is to sort based on largest "suffix" number - meaning the bigger
-// the number at the end, the more recent the target, the closer to the
-// start of the array.
-function sort_by_largest_numerical_suffix(a, b) {
-    var suffix_a = a.match(suffix_number_regex);
-    var suffix_b = b.match(suffix_number_regex);
-    if (suffix_a && suffix_b) {
-        // If the two targets being compared have suffixes, return less than
-        // zero, or greater than zero, based on which suffix is larger.
-        return (parseInt(suffix_a[1]) > parseInt(suffix_b[1]) ? -1 : 1);
-    } else {
-        // If no suffix numbers were detected, leave the order as-is between
-        // elements a and b.
-        return 0;
-    }
-}
-
-module.exports.print_newest_available_sdk_target = function() {
-    return module.exports.list_targets()
-    .then(function(targets) {
-        targets.sort(sort_by_largest_numerical_suffix);
-        console.log(targets[0]);
-    });
-};
-
-module.exports.version_string_to_api_level = {
-    '4.0': 14,
-    '4.0.3': 15,
-    '4.1': 16,
-    '4.2': 17,
-    '4.3': 18,
-    '4.4': 19,
-    '4.4W': 20,
-    '5.0': 21,
-    '5.1': 22,
-    '6.0': 23,
-    '7.0': 24,
-    '7.1.1': 25
-};
-
-function parse_targets(output) {
-    var target_out = output.split('\n');
-    var targets = [];
-    for (var i = target_out.length - 1; i >= 0; i--) {
-        if(target_out[i].match(/id:/)) { // if "id:" is in the line...
-            targets.push(target_out[i].match(/"(.+)"/)[1]); //.. match whatever is in quotes.
-        }
-    }
-    return targets;
-}
-
-module.exports.list_targets_with_android = function() {
-    return superspawn.spawn('android', ['list', 'target'])
-    .then(parse_targets);
-};
-
-module.exports.list_targets_with_avdmanager = function() {
-    return superspawn.spawn('avdmanager', ['list', 'target'])
-    .then(parse_targets);
-};
-
-module.exports.list_targets = function() {
-    return module.exports.list_targets_with_avdmanager()
-    .catch(function(err) {
-        // If there's an error, like avdmanager could not be found, we can try
-        // as a last resort, to run `android`, in case this is a super old
-        // SDK installation.
-        if (err && (err.code == 'ENOENT' || (err.stderr && err.stderr.match(/not recognized/)))) {
-            return module.exports.list_targets_with_android();
-        } else throw err;
-    })
-    .then(function(targets) {
-        if (targets.length === 0) {
-            return Q.reject(new Error('No android targets (SDKs) installed!'));
-        }
-        return targets;
-    });
-};
--- a/bin/templates/cordova/lib/builders/GradleBuilder.js
+++ b/bin/templates/cordova/lib/builders/GradleBuilder.js
@@ -55,8 +55,6 @@ GradleBuilder.prototype.getArgs = function(cmd, opts) {

    // 10 seconds -> 6 seconds
    args.push('-Dorg.gradle.daemon=true');
-    // to allow dex in process
-    args.push('-Dorg.gradle.jvmargs=-Xmx2048m');
    // allow NDK to be used - required by Gradle 1.5 plugin
    args.push('-Pandroid.useDeprecatedNdk=true');
    args.push.apply(args, opts.extraArgs);
@@ -65,42 +63,18 @@ GradleBuilder.prototype.getArgs = function(cmd, opts) {
    return args;
 };

-/*
- * This returns a promise
- */
-
-GradleBuilder.prototype.runGradleWrapper = function(gradle_cmd) {
-    var gradlePath = path.join(this.root, 'gradlew');
-    var wrapperGradle = path.join(this.root, 'wrapper.gradle');
-    if(fs.existsSync(gradlePath)) {
-      //Literally do nothing, for some reason this works, while !fs.existsSync didn't on Windows
-    } else {
-      return spawn(gradle_cmd, ['-p', this.root, 'wrapper', '-b', wrapperGradle], {stdio: 'inherit'});
-    }
-};
-
-
 // Makes the project buildable, minus the gradle wrapper.
 GradleBuilder.prototype.prepBuildFiles = function() {
    // Update the version of build.gradle in each dependent library.
    var pluginBuildGradle = path.join(this.root, 'cordova', 'lib', 'plugin-build.gradle');
    var propertiesObj = this.readProjectProperties();
    var subProjects = propertiesObj.libs;
-    var checkAndCopy = function(subProject, root) {
-      var subProjectGradle = path.join(root, subProject, 'build.gradle');
-      // This is the future-proof way of checking if a file exists
-      // This must be synchronous to satisfy a Travis test
-      try {
-          fs.accessSync(subProjectGradle, fs.F_OK);
-      } catch (e) {
-          shell.cp('-f', pluginBuildGradle, subProjectGradle);
-      }
-    };
    for (var i = 0; i < subProjects.length; ++i) {
        if (subProjects[i] !== 'CordovaLib') {
-          checkAndCopy(subProjects[i], this.root);
+            shell.cp('-f', pluginBuildGradle, path.join(this.root, subProjects[i], 'build.gradle'));
        }
    }
+
    var name = this.extractRealProjectNameFromManifest();
    //Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149
    var settingsGradlePaths =  subProjects.map(function(p){
@@ -119,24 +93,10 @@ GradleBuilder.prototype.prepBuildFiles = function() {
    // Update dependencies within build.gradle.
    var buildGradle = fs.readFileSync(path.join(this.root, 'build.gradle'), 'utf8');
    var depsList = '';
-    var root = this.root;
-    var insertExclude = function(p) {
-          var gradlePath = path.join(root, p, 'build.gradle');
-          var projectGradleFile = fs.readFileSync(gradlePath, 'utf-8');
-          if(projectGradleFile.indexOf('CordovaLib') != -1) {
-            depsList += '{\n        exclude module:("CordovaLib")\n    }\n';
-          }
-          else {
-            depsList +='\n';
-          }
-    };
    subProjects.forEach(function(p) {
-        console.log('Subproject Path: ' + p);
        var libName=p.replace(/[/\\]/g, ':').replace(name+'-','');
-        depsList += '    debugCompile(project(path: "' + libName + '", configuration: "debug"))';
-        insertExclude(p);
-        depsList += '    releaseCompile(project(path: "' + libName + '", configuration: "release"))';
-        insertExclude(p);
+        depsList += '    debugCompile project(path: "' + libName + '", configuration: "debug")\n';
+        depsList += '    releaseCompile project(path: "' + libName + '", configuration: "release")\n';
    });
    // For why we do this mapping: https://issues.apache.org/jira/browse/CB-8390
    var SYSTEM_LIBRARY_MAPPINGS = [
@@ -174,15 +134,17 @@ GradleBuilder.prototype.prepBuildFiles = function() {
 GradleBuilder.prototype.prepEnv = function(opts) {
    var self = this;
    return check_reqs.check_gradle()
-      .then(function(gradlePath) {
-        return self.runGradleWrapper(gradlePath);
-      }).then(function() {
-          return self.prepBuildFiles();
-      }).then(function() {
-        // We now copy the gradle out of the framework
-        // This is a dirty patch to get the build working
-        /*
-        var wrapperDir = path.join(self.root, 'CordovaLib');
+    .then(function() {
+        return self.prepBuildFiles();
+    }).then(function() {
+        // Copy the gradle wrapper on each build so that:
+        // A) we don't require the Android SDK at project creation time, and
+        // B) we always use the SDK's latest version of it.
+        // check_reqs ensures that this is set.
+        /*jshint -W069 */
+        var sdkDir = process.env['ANDROID_HOME'];
+        /*jshint +W069 */
+        var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
        if (process.platform == 'win32') {
            shell.rm('-f', path.join(self.root, 'gradlew.bat'));
            shell.cp(path.join(wrapperDir, 'gradlew.bat'), self.root);
@@ -193,13 +155,13 @@ GradleBuilder.prototype.prepEnv = function(opts) {
        shell.rm('-rf', path.join(self.root, 'gradle', 'wrapper'));
        shell.mkdir('-p', path.join(self.root, 'gradle'));
        shell.cp('-r', path.join(wrapperDir, 'gradle', 'wrapper'), path.join(self.root, 'gradle'));
-*/
+
        // If the gradle distribution URL is set, make sure it points to version we want.
        // If it's not set, do nothing, assuming that we're using a future version of gradle that we don't want to mess with.
        // For some reason, using ^ and $ don't work.  This does the job, though.
        var distributionUrlRegex = /distributionUrl.*zip/;
        /*jshint -W069 */
-        var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'https\\://services.gradle.org/distributions/gradle-3.3-all.zip';
+        var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'http\\://services.gradle.org/distributions/gradle-2.13-all.zip';
        /*jshint +W069 */
        var gradleWrapperPropertiesPath = path.join(self.root, 'gradle', 'wrapper', 'gradle-wrapper.properties');
        shell.chmod('u+w', gradleWrapperPropertiesPath);
@@ -227,7 +189,7 @@ GradleBuilder.prototype.build = function(opts) {
    .progress(function (stdio){
        if (stdio.stderr) {
            /*
-             * Workaround for the issue with Java printing some unwanted information to
+             * Workaround for the issue with Java printing some unwanted information to 
             * stderr instead of stdout.
             * This function suppresses 'Picked up _JAVA_OPTIONS' message from being
             * printed to stderr. See https://issues.apache.org/jira/browse/CB-9971 for
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -27,15 +27,11 @@ var path = require('path');
 var Adb = require('./Adb');
 var AndroidManifest = require('./AndroidManifest');
 var events = require('cordova-common').events;
-var superspawn = require('cordova-common').superspawn;
+var spawn = require('cordova-common').superspawn.spawn;
 var CordovaError = require('cordova-common').CordovaError;
-var shelljs = require('shelljs');
-var android_sdk = require('./android_sdk');
-var check_reqs = require('./check_reqs');

 var Q             = require('q');
 var os            = require('os');
-var fs            = require('fs');
 var child_process = require('child_process');

 // constants
@@ -46,77 +42,18 @@ var NUM_INSTALL_RETRIES     = 3;
 var CHECK_BOOTED_INTERVAL   = 3 * ONE_SECOND; // in milliseconds
 var EXEC_KILL_SIGNAL        = 'SIGKILL';

-function forgivingWhichSync(cmd) {
-    try {
-        return fs.realpathSync(shelljs.which(cmd));
-    } catch (e) {
-        return '';
-    }
-}
-
-module.exports.list_images_using_avdmanager = function () {
-    return superspawn.spawn('avdmanager', ['list', 'avd'])
-    .then(function(output) {
-        var response = output.split('\n');
-        var emulator_list = [];
-        for (var i = 1; i < response.length; i++) {
-            // To return more detailed information use img_obj
-            var img_obj = {};
-            if (response[i].match(/Name:\s/)) {
-                img_obj['name'] = response[i].split('Name: ')[1].replace('\r', '');
-                if (response[i + 1].match(/Device:\s/)) {
-                    i++;
-                    img_obj['device'] = response[i].split('Device: ')[1].replace('\r', '');
-                }
-                if (response[i + 1].match(/Path:\s/)) {
-                    i++;
-                    img_obj['path'] = response[i].split('Path: ')[1].replace('\r', '');
-                }
-                if (response[i + 1].match(/Target:\s/)) {
-                    i++;
-                    if (response[i + 1].match(/ABI:\s/)) {
-                        img_obj['abi'] = response[i + 1].split('ABI: ')[1].replace('\r', '');
-                    }
-                    // This next conditional just aims to match the old output of `android list avd`
-                    // We do so so that we don't have to change the logic when parsing for the
-                    // best emulator target to spawn (see below in `best_image`)
-                    // This allows us to transitionally support both `android` and `avdmanager` binaries,
-                    // depending on what SDK version the user has
-                    if (response[i + 1].match(/Based\son:\s/)) {
-                        img_obj['target'] = response[i + 1].split('Based on:')[1];
-                        if (img_obj['target'].match(/Tag\/ABI:\s/)) {
-                            img_obj['target'] = img_obj['target'].split('Tag/ABI:')[0].replace('\r', '').trim();
-                            if (img_obj['target'].indexOf('(') > -1) {
-                                img_obj['target'] = img_obj['target'].substr(0, img_obj['target'].indexOf('(') - 1).trim();
-                            }
-                        }
-                        var version_string = img_obj['target'].replace(/Android\s+/, '');
-
-                        var api_level = android_sdk.version_string_to_api_level[version_string];
-                        if (api_level) {
-                            img_obj['target'] += ' (API level ' + api_level + ')';
-                        }
-                    }
-                }
-                if (response[i + 1].match(/Skin:\s/)) {
-                    i++;
-                    img_obj['skin'] = response[i].split('Skin: ')[1].replace('\r', '');
-                }
-
-                emulator_list.push(img_obj);
-            }
-            /* To just return a list of names use this
-            if (response[i].match(/Name:\s/)) {
-                emulator_list.push(response[i].split('Name: ')[1].replace('\r', '');
-            }*/
-
-        }
-        return emulator_list;
-    });
-};
-
-module.exports.list_images_using_android = function() {
-    return superspawn.spawn('android', ['list', 'avd'])
+/**
+ * Returns a Promise for a list of emulator images in the form of objects
+ * {
+       name   : <emulator_name>,
+       path   : <path_to_emulator_image>,
+       target : <api_target>,
+       abi    : <cpu>,
+       skin   : <skin>
+   }
+ */
+module.exports.list_images = function() {
+    return spawn('android', ['list', 'avds'])
    .then(function(output) {
        var response = output.split('\n');
        var emulator_list = [];
@@ -159,29 +96,6 @@ module.exports.list_images_using_android = function() {
    });
 };

-/**
- * Returns a Promise for a list of emulator images in the form of objects
- * {
-       name   : <emulator_name>,
-       device : <device>,
-       path   : <path_to_emulator_image>,
-       target : <api_target>,
-       abi    : <cpu>,
-       skin   : <skin>
-   }
- */
-module.exports.list_images = function() {
-    if (forgivingWhichSync('avdmanager')) {
-        return module.exports.list_images_using_avdmanager();
-    } else if (forgivingWhichSync('android')) {
-        return module.exports.list_images_using_android();
-    } else {
-        return Q().then(function() {
-            throw new CordovaError('Could not find either `android` or `avdmanager` on your $PATH! Are you sure the Android SDK is installed and available?');
-        });
-    }
-};
-
 /**
 * Will return the closest avd to the projects target
 * or undefined if no avds exist.
@@ -195,7 +109,8 @@ module.exports.best_image = function() {

        var closest = 9999;
        var best = images[0];
-        var project_target = check_reqs.get_target().replace('android-', '');
+        // Loading check_reqs at run-time to avoid test-time vs run-time directory structure difference issue
+        var project_target = require('./check_reqs').get_target().replace('android-', '');
        for (var i in images) {
            var target = images[i].target;
            if(target) {
@@ -218,9 +133,8 @@ module.exports.list_started = function() {
 };

 // Returns a promise.
-// TODO: we should remove this, there's a more robust method under android_sdk.js
 module.exports.list_targets = function() {
-    return superspawn.spawn('android', ['list', 'targets'], {cwd: os.tmpdir()})
+    return spawn('android', ['list', 'targets'], {cwd: os.tmpdir()})
    .then(function(output) {
        var target_out = output.split('\n');
        var targets = [];
@@ -275,7 +189,8 @@ module.exports.start = function(emulator_ID, boot_timeout) {
                return best.name;
            }

-            var androidCmd = check_reqs.getAbsoluteAndroidCmd();
+            // Loading check_reqs at run-time to avoid test-time vs run-time directory structure difference issue
+            var androidCmd = require('./check_reqs').getAbsoluteAndroidCmd();
            return Q.reject(new CordovaError('No emulator images (avds) found.\n' +
                '1. Download desired System Image by running: ' + androidCmd + ' sdk\n' +
                '2. Create an AVD by running: ' + androidCmd + ' avd\n' +
@@ -284,13 +199,10 @@ module.exports.start = function(emulator_ID, boot_timeout) {
    }).then(function(emulatorId) {
        return self.get_available_port()
        .then(function (port) {
-            // Figure out the directory the emulator binary runs in, and set the cwd to that directory.
-            // Workaround for https://code.google.com/p/android/issues/detail?id=235461
-            var emulator_dir = path.dirname(shelljs.which('emulator'));
            var args = ['-avd', emulatorId, '-port', port];
            // Don't wait for it to finish, since the emulator will probably keep running for a long time.
            child_process
-                .spawn('emulator', args, { stdio: 'inherit', detached: true, cwd: emulator_dir })
+                .spawn('emulator', args, { stdio: 'inherit', detached: true })
                .unref();

            // wait for emulator to start
@@ -382,7 +294,7 @@ module.exports.wait_for_boot = function(emulator_id, time_remaining) {
 module.exports.create_image = function(name, target) {
    console.log('Creating new avd named ' + name);
    if (target) {
-        return superspawn.spawn('android', ['create', 'avd', '--name', name, '--target', target])
+        return spawn('android', ['create', 'avd', '--name', name, '--target', target])
        .then(null, function(error) {
            console.error('ERROR : Failed to create emulator image : ');
            console.error(' Do you have the latest android targets including ' + target + '?');
@@ -390,8 +302,7 @@ module.exports.create_image = function(name, target) {
        });
    } else {
        console.log('WARNING : Project target not found, creating avd with a different target but the project may fail to install.');
-        // TODO: there's a more robust method for finding targets in android_sdk.js
-        return superspawn.spawn('android', ['create', 'avd', '--name', name, '--target', this.list_targets()[0]])
+        return spawn('android', ['create', 'avd', '--name', name, '--target', this.list_targets()[0]])
        .then(function() {
            // TODO: This seems like another error case, even though it always happens.
            console.error('ERROR : Unable to create an avd emulator, no targets found.');
--- a/bin/templates/cordova/lib/list-devices
+++ b/bin/templates/cordova/lib/list-devices
@@ -22,7 +22,7 @@
 var devices = require('./device');

 // Usage support for when args are given
-require('./check_reqs').check_android().then(function() {
+require('../lib/check_reqs').check_android().then(function() {
    devices.list().done(function(device_list) {
        device_list && device_list.forEach(function(dev) {
            console.log(dev);
--- a/bin/templates/cordova/lib/list-emulator-images
+++ b/bin/templates/cordova/lib/list-emulator-images
@@ -22,7 +22,7 @@
 var emulators = require('./emulator');

 // Usage support for when args are given
-require('./check_reqs').check_android().then(function() {
+require('../lib/check_reqs').check_android().then(function() {
    emulators.list_images().done(function(emulator_list) {
        emulator_list && emulator_list.forEach(function(emu) {
            console.log(emu.name);
--- a/bin/templates/cordova/lib/list-started-emulators
+++ b/bin/templates/cordova/lib/list-started-emulators
@@ -22,7 +22,7 @@
 var emulators = require('./emulator');

 // Usage support for when args are given
-require('./check_reqs').check_android().then(function() {
+require('../lib/check_reqs').check_android().then(function() {
    emulators.list_started().done(function(emulator_list) {
        emulator_list && emulator_list.forEach(function(emu) {
            console.log(emu);
--- a/bin/templates/cordova/lib/plugin-build.gradle
+++ b/bin/templates/cordova/lib/plugin-build.gradle
@@ -21,15 +21,24 @@
 buildscript {
    repositories {
        mavenCentral()
-        jcenter()
    }

    // Switch the Android Gradle plugin version requirement depending on the
    // installed version of Gradle. This dependency is documented at
    // http://tools.android.com/tech-docs/new-build-system/version-compatibility
    // and https://issues.apache.org/jira/browse/CB-8143
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0+'
+    if (gradle.gradleVersion >= "2.2") {
+        dependencies {
+            classpath 'com.android.tools.build:gradle:1.0.0+'
+        }
+    } else if (gradle.gradleVersion >= "2.1") {
+        dependencies {
+            classpath 'com.android.tools.build:gradle:0.14.0+'
+        }
+    } else {
+        dependencies {
+            classpath 'com.android.tools.build:gradle:0.12.0+'
+        }
    }
 }

--- a/bin/templates/cordova/lib/pluginHandlers.js
+++ b/bin/templates/cordova/lib/pluginHandlers.js
@@ -30,13 +30,7 @@ var handlers = {
        install:function(obj, plugin, project, options) {
            if (!obj.src) throw new CordovaError(generateAttributeError('src', 'source-file', plugin.id));
            if (!obj.targetDir) throw new CordovaError(generateAttributeError('target-dir', 'source-file', plugin.id));
-
            var dest = path.join(obj.targetDir, path.basename(obj.src));
-
-            if(options && options.android_studio === true) {
-              dest = path.join('app/src/main/java', obj.targetDir.substring(4), path.basename(obj.src));
-            }
-
            if (options && options.force) {
                copyFile(plugin.dir, obj.src, project.projectDir, dest, !!(options && options.link));
            } else {
@@ -45,27 +39,16 @@ var handlers = {
        },
        uninstall:function(obj, plugin, project, options) {
            var dest = path.join(obj.targetDir, path.basename(obj.src));
-            
-            if(options && options.android_studio === true) {
-              dest = path.join('app/src/main/java', obj.targetDir.substring(4), path.basename(obj.src));
-            }
-
            deleteJava(project.projectDir, dest);
        }
    },
    'lib-file':{
        install:function(obj, plugin, project, options) {
            var dest = path.join('libs', path.basename(obj.src));
-            if(options && options.android_studio === true) {
-              dest = path.join('app/libs', path.basename(obj.src));
-            }
            copyFile(plugin.dir, obj.src, project.projectDir, dest, !!(options && options.link));
        },
        uninstall:function(obj, plugin, project, options) {
            var dest = path.join('libs', path.basename(obj.src));
-            if(options && options.android_studio === true) {
-              dest = path.join('app/libs', path.basename(obj.src));
-            }
            removeFile(project.projectDir, dest);
        }
    },
@@ -231,8 +214,9 @@ function copyFile (plugin_dir, src, project_dir, dest, link) {
        throw new CordovaError('Destination "' + dest + '" for source file "' + src + '" is located outside the project');

    shell.mkdir('-p', path.dirname(dest));
+
    if (link) {
-        symlinkFileOrDirTree(src, dest);
+        fs.symlinkSync(path.relative(path.dirname(dest), src), dest);
    } else if (fs.statSync(src).isDirectory()) {
        // XXX shelljs decides to create a directory when -R|-r is used which sucks. http://goo.gl/nbsjq
        shell.cp('-Rf', src+'/*', dest);
@@ -250,22 +234,6 @@ function copyNewFile (plugin_dir, src, project_dir, dest, link) {
    copyFile(plugin_dir, src, project_dir, dest, !!link);
 }

-function symlinkFileOrDirTree(src, dest) {
-    if (fs.existsSync(dest)) {
-        shell.rm('-Rf', dest);
-    }
-
-    if (fs.statSync(src).isDirectory()) {
-        shell.mkdir('-p', dest);
-        fs.readdirSync(src).forEach(function(entry) {
-            symlinkFileOrDirTree(path.join(src, entry), path.join(dest, entry));
-        });
-    }
-    else {
-        fs.symlinkSync(path.relative(fs.realpathSync(path.dirname(dest)), src), dest);
-    }
-}
-
 // checks if file exists and then deletes. Error if doesn't exist
 function removeFile (project_dir, src) {
    var file = path.resolve(project_dir, src);
--- a/bin/templates/cordova/lib/prepare.js
+++ b/bin/templates/cordova/lib/prepare.js
@@ -33,6 +33,7 @@ var PluginInfoProvider = require('cordova-common').PluginInfoProvider;

 module.exports.prepare = function (cordovaProject, options) {
    var self = this;
+    var platformResourcesDir = path.relative(cordovaProject.root, path.join(this.locations.root, 'res'));

    var platformJson = PlatformJson.load(this.locations.root, this.platform);
    var munger = new PlatformMunger(this.platform, this.locations.root, platformJson, new PluginInfoProvider());
@@ -46,9 +47,8 @@ module.exports.prepare = function (cordovaProject, options) {
        return updateProjectAccordingTo(self._config, self.locations);
    })
    .then(function () {
-        updateIcons(cordovaProject, path.relative(cordovaProject.root, self.locations.res));
-        updateSplashes(cordovaProject, path.relative(cordovaProject.root, self.locations.res));
-        updateFileResources(cordovaProject, path.relative(cordovaProject.root, self.locations.root));
+        updateIcons(cordovaProject, platformResourcesDir);
+        updateSplashes(cordovaProject, platformResourcesDir);
    })
    .then(function () {
        events.emit('verbose', 'Prepared android project successfully');
@@ -61,19 +61,20 @@ module.exports.clean = function (options) {
    // noPrepare option passed in by the non-CLI clean script. If that's present, or if
    // there's no config.xml found at the project root, then don't clean prepared files.
    var projectRoot = path.resolve(this.root, '../..');
-    if ((options && options.noPrepare) || !fs.existsSync(this.locations.configXml) ||
+    var projectConfigFile = path.join(projectRoot, 'config.xml');
+    if ((options && options.noPrepare) || !fs.existsSync(projectConfigFile) ||
            !fs.existsSync(this.locations.configXml)) {
        return Q();
    }

    var projectConfig = new ConfigParser(this.locations.configXml);
+    var platformResourcesDir = path.relative(projectRoot, path.join(this.locations.root, 'res'));

    var self = this;
    return Q().then(function () {
        cleanWww(projectRoot, self.locations);
-        cleanIcons(projectRoot, projectConfig, path.relative(projectRoot, self.locations.res));
-        cleanSplashes(projectRoot, projectConfig, path.relative(projectRoot, self.locations.res));
-        cleanFileResources(projectRoot, projectConfig, path.relative(projectRoot, self.locations.root));
+        cleanIcons(projectRoot, projectConfig, platformResourcesDir);
+        cleanSplashes(projectRoot, projectConfig, platformResourcesDir);
    });
 };

@@ -171,7 +172,7 @@ function updateProjectAccordingTo(platformConfig, locations) {
    // Update app name by editing res/values/strings.xml
    var name = platformConfig.name();
    var strings = xmlHelpers.parseElementtreeSync(locations.strings);
-    strings.find('string[@name="app_name"]').text = name.replace(/\'/g, '\\\'');
+    strings.find('string[@name="app_name"]').text = name;
    fs.writeFileSync(locations.strings, strings.write({indent: 4}), 'utf-8');
    events.emit('verbose', 'Wrote out android application name "' + name + '" to ' + locations.strings);

@@ -246,11 +247,11 @@ function default_versionCode(version) {
    return versionCode;
 }

-function getImageResourcePath(resourcesDir, type, density, name, sourceName) {
+function getImageResourcePath(resourcesDir, density, name, sourceName) {
    if (/\.9\.png$/.test(sourceName)) {
        name = name.replace(/\.png$/, '.9.png');
    }
-    var resourcePath = path.join(resourcesDir, (density ? type + '-' + density : type), name);
+    var resourcePath = path.join(resourcesDir, (density ? 'drawable-' + density : 'drawable'), name);
    return resourcePath;
 }

@@ -263,7 +264,7 @@ function updateSplashes(cordovaProject, platformResourcesDir) {
        return;
    }

-    var resourceMap = mapImageResources(cordovaProject.root, platformResourcesDir, 'drawable', 'screen.png');
+    var resourceMap = mapImageResources(cordovaProject.root, platformResourcesDir, 'screen.png');

    var hadMdpi = false;
    resources.forEach(function (resource) {
@@ -274,14 +275,14 @@ function updateSplashes(cordovaProject, platformResourcesDir) {
            hadMdpi = true;
        }
        var targetPath = getImageResourcePath(
-            platformResourcesDir, 'drawable', resource.density, 'screen.png', path.basename(resource.src));
+            platformResourcesDir, resource.density, 'screen.png', path.basename(resource.src));
        resourceMap[targetPath] = resource.src;
    });

    // There's no "default" drawable, so assume default == mdpi.
    if (!hadMdpi && resources.defaultResource) {
        var targetPath = getImageResourcePath(
-            platformResourcesDir, 'drawable', 'mdpi', 'screen.png', path.basename(resources.defaultResource.src));
+            platformResourcesDir, 'mdpi', 'screen.png', path.basename(resources.defaultResource.src));
        resourceMap[targetPath] = resources.defaultResource.src;
    }

@@ -293,7 +294,7 @@ function updateSplashes(cordovaProject, platformResourcesDir) {
 function cleanSplashes(projectRoot, projectConfig, platformResourcesDir) {
    var resources = projectConfig.getSplashScreens('android');
    if (resources.length > 0) {
-        var resourceMap = mapImageResources(projectRoot, platformResourcesDir, 'drawable', 'screen.png');
+        var resourceMap = mapImageResources(projectRoot, platformResourcesDir, 'screen.png');
        events.emit('verbose', 'Cleaning splash screens at ' + platformResourcesDir);

        // No source paths are specified in the map, so updatePaths() will delete the target files.
@@ -311,7 +312,7 @@ function updateIcons(cordovaProject, platformResourcesDir) {
        return;
    }

-    var resourceMap = mapImageResources(cordovaProject.root, platformResourcesDir, 'mipmap', 'icon.png');
+    var resourceMap = mapImageResources(cordovaProject.root, platformResourcesDir, 'icon.png');

    var android_icons = {};
    var default_icon;
@@ -362,14 +363,14 @@ function updateIcons(cordovaProject, platformResourcesDir) {
    // project's config.xml location, so we use it as base path.
    for (var density in android_icons) {
        var targetPath = getImageResourcePath(
-            platformResourcesDir, 'mipmap', density, 'icon.png', path.basename(android_icons[density].src));
+            platformResourcesDir, density, 'icon.png', path.basename(android_icons[density].src));
        resourceMap[targetPath] = android_icons[density].src;
    }

    // There's no "default" drawable, so assume default == mdpi.
    if (default_icon && !android_icons.mdpi) {
        var defaultTargetPath = getImageResourcePath(
-            platformResourcesDir, 'mipmap', 'mdpi', 'icon.png', path.basename(default_icon.src));
+            platformResourcesDir, 'mdpi', 'icon.png', path.basename(default_icon.src));
        resourceMap[defaultTargetPath] = default_icon.src;
    }

@@ -381,7 +382,7 @@ function updateIcons(cordovaProject, platformResourcesDir) {
 function cleanIcons(projectRoot, projectConfig, platformResourcesDir) {
    var icons = projectConfig.getIcons('android');
    if (icons.length > 0) {
-        var resourceMap = mapImageResources(projectRoot, platformResourcesDir, 'mipmap', 'icon.png');
+        var resourceMap = mapImageResources(projectRoot, platformResourcesDir, 'icon.png');
        events.emit('verbose', 'Cleaning icons at ' + platformResourcesDir);

        // No source paths are specified in the map, so updatePaths() will delete the target files.
@@ -393,9 +394,9 @@ function cleanIcons(projectRoot, projectConfig, platformResourcesDir) {
 /**
 * Gets a map containing resources of a specified name from all drawable folders in a directory.
 */
-function mapImageResources(rootDir, subDir, type, resourceName) {
+function mapImageResources(rootDir, subDir, resourceName) {
    var pathMap = {};
-    shell.ls(path.join(rootDir, subDir, type + '-*'))
+    shell.ls(path.join(rootDir, subDir, 'drawable-*'))
    .forEach(function (drawableFolder) {
        var imagePath = path.join(subDir, path.basename(drawableFolder), resourceName);
        pathMap[imagePath] = null;
@@ -403,44 +404,6 @@ function mapImageResources(rootDir, subDir, type, resourceName) {
    return pathMap;
 }

-
-function updateFileResources(cordovaProject, platformDir) {
-    var files = cordovaProject.projectConfig.getFileResources('android');
-
-    // if there are resource-file elements in config.xml
-    if (files.length === 0) {
-        events.emit('verbose', 'This app does not have additional resource files defined');
-        return;
-    }
-
-    var resourceMap = {};
-    files.forEach(function(res) {
-        var targetPath = path.join(platformDir, res.target);
-        resourceMap[targetPath] = res.src;
-    });
-
-    events.emit('verbose', 'Updating resource files at ' + platformDir);
-    FileUpdater.updatePaths(
-        resourceMap, { rootDir: cordovaProject.root }, logFileOp);
-}
-
-
-function cleanFileResources(projectRoot, projectConfig, platformDir) {
-    var files = projectConfig.getFileResources('android');
-    if (files.length > 0) {
-        events.emit('verbose', 'Cleaning resource files at ' + platformDir);
-
-        var resourceMap = {};
-        files.forEach(function(res) {
-            var filePath = path.join(platformDir, res.target);
-            resourceMap[filePath] = null;
-        });
-
-        FileUpdater.updatePaths(
-                resourceMap, { rootDir: projectRoot, all: true}, logFileOp);
-    }
-}
-
 /**
 * Gets and validates 'AndroidLaunchMode' prepference from config.xml. Returns
 *   preference value and warns if it doesn't seems to be valid
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,7 +20,7 @@
 */

 // Coho updates this line:
-var VERSION = "6.2.3";
+var VERSION = "5.2.1";

 module.exports.version = VERSION;

--- a/bin/templates/project/Activity.java
+++ b/bin/templates/project/Activity.java
@@ -28,13 +28,6 @@ public class __ACTIVITY__ extends CordovaActivity
    public void onCreate(Bundle savedInstanceState)
    {
        super.onCreate(savedInstanceState);
-
-        // enable Cordova apps to be started in the background
-        Bundle extras = getIntent().getExtras();
-        if (extras != null && extras.getBoolean("cdvStartInBackground", false)) {
-            moveTaskToBack(true);
-        }
-
        // Set by <content src="index.html" /> in config.xml
        loadUrl(launchUrl);
    }
--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@ -30,7 +30,7 @@

    <uses-permission android:name="android.permission.INTERNET" />

-    <application android:icon="@mipmap/icon" android:label="@string/app_name"
+    <application android:icon="@drawable/icon" android:label="@string/app_name"
        android:hardwareAccelerated="true" android:supportsRtl="true">
        <activity android:name="__ACTIVITY__"
                android:label="@string/activity_name"
@@ -45,5 +45,5 @@
        </activity>
    </application>

-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="__APILEVEL__"/>
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="__APILEVEL__"/>
 </manifest>
--- a/bin/templates/project/assets/www/cordova.js
+++ b/bin/templates/project/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 7ef9f9c03167a4dde4372d869472241b6816fee9
+// 2fd4bcb84048415922d13d80d35b8d1668e8e150
 /*
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
 under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '6.2.3';
+var PLATFORM_VERSION_BUILD_LABEL = '5.2.1';
 // file: src/scripts/require.js

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

 });

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

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

 });

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

 /**
@@ -742,13 +742,8 @@ var Channel = function(type, sticky) {
        }
    };

-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."
-        );
-    }
+function forceFunction(f) {
+    if (typeof f != 'function') throw "Function required as first argument!";
 }

 /**
@@ -758,39 +753,28 @@ function checkSubscriptionArgument(argument) {
 * 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;
-    }
-
+Channel.prototype.subscribe = function(f, c) {
+    // need a function to call
+    forceFunction(f);
    if (this.state == 2) {
-        handleEvent.apply(eventListener || this, this.fireArgs);
+        f.apply(c || this, this.fireArgs);
        return;
    }

-    guid = eventListenerOrFunction.observer_guid;
-    if (typeof eventListener === "object") {
-        handleEvent = utils.close(eventListener, handleEvent);
-    }
+    var func = f,
+        guid = f.observer_guid;
+    if (typeof c == "object") { func = utils.close(c, f); }

    if (!guid) {
-        // First time any channel has seen this subscriber
+        // first time any channel has seen this subscriber
        guid = '' + nextGuid++;
    }
-    handleEvent.observer_guid = guid;
-    eventListenerOrFunction.observer_guid = guid;
+    func.observer_guid = guid;
+    f.observer_guid = guid;

    // Don't add the same handler more than once.
    if (!this.handlers[guid]) {
-        this.handlers[guid] = handleEvent;
+        this.handlers[guid] = func;
        this.numHandlers++;
        if (this.numHandlers == 1) {
            this.onHasSubscribersChange && this.onHasSubscribersChange();
@@ -801,20 +785,12 @@ Channel.prototype.subscribe = function(eventListenerOrFunction, eventListener) {
 /**
 * Unsubscribes the function with the given guid from the channel.
 */
-Channel.prototype.unsubscribe = function(eventListenerOrFunction) {
-    checkSubscriptionArgument(eventListenerOrFunction);
-    var handleEvent, guid, handler;
+Channel.prototype.unsubscribe = function(f) {
+    // need a function to unsubscribe
+    forceFunction(f);

-    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];
+    var guid = f.observer_guid,
+        handler = this.handlers[guid];
    if (handler) {
        delete this.handlers[guid];
        this.numHandlers--;
@@ -886,7 +862,7 @@ module.exports = channel;

 });

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

 /**
@@ -921,11 +897,10 @@ var cordova = require('cordova'),
        // 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
+        ONLINE_EVENT: 2
    },
    jsToNativeBridgeMode,  // Set lazily.
-    nativeToJsBridgeMode = nativeToJsModes.EVAL_BRIDGE,
+    nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT,
    pollEnabled = false,
    bridgeSecret = -1;

@@ -948,9 +923,6 @@ function androidExec(success, fail, service, action, args) {
        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') {
@@ -960,6 +932,7 @@ function androidExec(success, fail, service, action, args) {

    var callbackId = service + cordova.callbackId++,
        argsJson = JSON.stringify(args);
+
    if (success || fail) {
        cordova.callbacks[callbackId] = {success:success, fail:fail};
    }
@@ -979,17 +952,6 @@ function androidExec(success, fail, service, action, args) {
 }

 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();
 };
@@ -1649,7 +1611,7 @@ exports.reset();

 });

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

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

 });

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

 var exec = require('cordova/exec');
@@ -2121,10 +2083,7 @@ utils.clone = function(obj) {

    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') {
+        if(!(i in retVal) || retVal[i] != obj[i]) {
            retVal[i] = utils.clone(obj[i]);
        }
    }
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -30,7 +30,7 @@ buildscript {
    // http://tools.android.com/tech-docs/new-build-system/version-compatibility
    // and https://issues.apache.org/jira/browse/CB-8143
    dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.0'
    }
 }

@@ -43,7 +43,7 @@ allprojects {
 }

 task wrapper(type: Wrapper) {
-    gradleVersion = '2.14.1'
+    gradleVersion = '2.13'
 }

 // Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties.
@@ -164,7 +164,7 @@ android {
    }

    defaultConfig {
-        versionCode cdvVersionCode ?: new BigInteger("" + privateHelpers.extractIntFromManifest("versionCode"))
+        versionCode cdvVersionCode ?: Integer.parseInt("" + privateHelpers.extractIntFromManifest("versionCode"))
        applicationId privateHelpers.extractStringFromManifest("package")

        if (cdvMinSdkVersion != null) {
@@ -264,7 +264,7 @@ def promptForReleaseKeyPassword() {

 gradle.taskGraph.whenReady { taskGraph ->
    taskGraph.getAllTasks().each() { task ->
-        if (task.name == 'validateReleaseSigning' || task.name == 'validateSigningRelease') {
+        if (task.name == 'validateReleaseSigning') {
            promptForReleaseKeyPassword()
        }
    }
--- a/bin/templates/project/res/drawable-hdpi/icon.png
+++ b/bin/templates/project/res/drawable-hdpi/icon.png
--- a/bin/templates/project/res/drawable-land-xxhdpi/screen.png
+++ b/bin/templates/project/res/drawable-land-xxhdpi/screen.png
--- a/bin/templates/project/res/drawable-land-xxxhdpi/screen.png
+++ b/bin/templates/project/res/drawable-land-xxxhdpi/screen.png
--- a/bin/templates/project/res/drawable-ldpi/icon.png
+++ b/bin/templates/project/res/drawable-ldpi/icon.png
--- a/bin/templates/project/res/drawable-mdpi/icon.png
+++ b/bin/templates/project/res/drawable-mdpi/icon.png
--- a/bin/templates/project/res/drawable-port-xxhdpi/screen.png
+++ b/bin/templates/project/res/drawable-port-xxhdpi/screen.png
--- a/bin/templates/project/res/drawable-port-xxxhdpi/screen.png
+++ b/bin/templates/project/res/drawable-port-xxxhdpi/screen.png
--- a/bin/templates/project/res/drawable-xhdpi/icon.png
+++ b/bin/templates/project/res/drawable-xhdpi/icon.png
--- a/bin/templates/project/res/mipmap-xxhdpi/icon.png
+++ b/bin/templates/project/res/mipmap-xxhdpi/icon.png
--- a/bin/templates/project/res/mipmap-xxxhdpi/icon.png
+++ b/bin/templates/project/res/mipmap-xxxhdpi/icon.png
--- a/bin/templates/project/wrapper.gradle
+++ b/bin/templates/project/wrapper.gradle
@@ -1 +0,0 @@
-//This file is intentionally just a comment
--- a/cordova-js-src/exec.js
+++ b/cordova-js-src/exec.js
@@ -51,11 +51,10 @@ var cordova = require('cordova'),
        // 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
+        ONLINE_EVENT: 2
    },
    jsToNativeBridgeMode,  // Set lazily.
-    nativeToJsBridgeMode = nativeToJsModes.EVAL_BRIDGE,
+    nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT,
    pollEnabled = false,
    bridgeSecret = -1;

@@ -78,9 +77,6 @@ function androidExec(success, fail, service, action, args) {
        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') {
@@ -90,6 +86,7 @@ function androidExec(success, fail, service, action, args) {

    var callbackId = service + cordova.callbackId++,
        argsJson = JSON.stringify(args);
+
    if (success || fail) {
        cordova.callbacks[callbackId] = {success:success, fail:fail};
    }
@@ -109,17 +106,6 @@ function androidExec(success, fail, service, action, args) {
 }

 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();
 };
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -16,32 +16,27 @@
   under the License.
 */

+
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.0'
+    }
+
+}
+
+apply plugin: 'com.android.library'
+
 ext {
    apply from: 'cordova.gradle'
    cdvCompileSdkVersion = privateHelpers.getProjectTarget()
    cdvBuildToolsVersion = privateHelpers.findLatestInstalledBuildTools()
 }

-buildscript {
-    repositories {
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-
-group = 'org.apache.cordova'
-version = '6.2.3'
-
 android {
    compileSdkVersion cdvCompileSdkVersion
    buildToolsVersion cdvBuildToolsVersion
@@ -63,73 +58,4 @@ android {
            assets.srcDirs = ['assets']
        }
    }
-
-    packagingOptions {
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/NOTICE'
-    }
-}
-
-install {
-    repositories.mavenInstaller {
-        pom {
-            project {
-                packaging 'aar'
-                name 'Cordova'
-                url 'https://cordova.apache.org'
-                licenses {
-                    license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id 'stevengill'
-                        name 'Steve Gill'
-                    }
-                }
-                scm {
-                    connection 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git'
-                    developerConnection 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git'
-                    url 'https://git-wip-us.apache.org/repos/asf?p=cordova-android'
-
-                }
-            }
-        }
-    }
-}
-
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-artifacts {
-    archives sourcesJar
-}
-
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_KEY')
-    configurations = ['archives']
-    pkg {
-        repo = 'maven'
-        name = 'cordova-android'
-        userOrg = 'cordova'
-        licenses = ['Apache-2.0']
-        vcsUrl = 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git'
-        websiteUrl = 'https://cordova.apache.org'
-        issueTrackerUrl = 'https://issues.apache.org/jira/browse/CB'
-        publicDownloadNumbers = true
-        licenses = ['Apache-2.0']
-        labels = ['android', 'cordova', 'phonegap']
-        version {
-            name = '6.2.3'
-            released  = new Date()
-            vcsTag = '6.2.3'
-        }
-    }
 }
--- a/framework/cordova.gradle
+++ b/framework/cordova.gradle
@@ -125,7 +125,7 @@ def doExtractIntFromManifest(name) {
    def pattern = Pattern.compile(name + "=\"(\\d+)\"")
    def matcher = pattern.matcher(manifestFile.getText())
    matcher.find()
-    return new BigInteger(matcher.group(1))
+    return Integer.parseInt(matcher.group(1))
 }

 def doExtractStringFromManifest(name) {
--- a/framework/gradle/wrapper/gradle-wrapper.properties
+++ b/framework/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +0,0 @@
-#Mon Dec 28 10:00:20 PST 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
--- a/framework/project.properties
+++ b/framework/project.properties
@@ -10,7 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-25
+target=android-23
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true
--- a/framework/src/org/apache/cordova/CallbackContext.java
+++ b/framework/src/org/apache/cordova/CallbackContext.java
@@ -20,6 +20,8 @@ package org.apache.cordova;

 import org.json.JSONArray;

+import android.util.Log;
+
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.PluginResult;
 import org.json.JSONObject;
@@ -36,15 +38,15 @@ public class CallbackContext {
        this.callbackId = callbackId;
        this.webView = webView;
    }
-
+    
    public boolean isFinished() {
        return finished;
    }
-
+    
    public boolean isChangingThreads() {
        return changingThreads > 0;
    }
-
+    
    public String getCallbackId() {
        return callbackId;
    }
@@ -52,7 +54,7 @@ public class CallbackContext {
    public void sendPluginResult(PluginResult pluginResult) {
        synchronized (this) {
            if (finished) {
-                LOG.w(LOG_TAG, "Attempted to send a second callback for ID: " + callbackId + "\nResult was: " + pluginResult.getMessage());
+                Log.w(LOG_TAG, "Attempted to send a second callback for ID: " + callbackId + "\nResult was: " + pluginResult.getMessage());
                return;
            } else {
                finished = !pluginResult.getKeepCallback();
@@ -96,7 +98,7 @@ public class CallbackContext {
    public void success(byte[] message) {
        sendPluginResult(new PluginResult(PluginResult.Status.OK, message));
    }
-
+    
    /**
     * Helper for success callbacks that just returns the Status.OK by default
     *
--- a/framework/src/org/apache/cordova/Config.java
+++ b/framework/src/org/apache/cordova/Config.java
@@ -22,6 +22,7 @@ package org.apache.cordova;
 import java.util.List;

 import android.app.Activity;
+import android.util.Log;

@Deprecated // Use Whitelist, CordovaPrefences, etc. directly.
 public class Config {
@@ -60,7 +61,7 @@ public class Config {
    public static List<PluginEntry> getPluginEntries() {
        return parser.getPluginEntries();
    }
-
+    
    public static CordovaPreferences getPreferences() {
        return parser.getPreferences();
    }
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -34,6 +34,7 @@ import android.graphics.Color;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -49,7 +50,7 @@ import android.widget.FrameLayout;
 * html file that contains the application.
 *
 * As an example:
- *
+ * 
 * <pre>
 *     package org.apache.cordova.examples;
 *
@@ -66,8 +67,8 @@ import android.widget.FrameLayout;
 *       }
 *     }
 * </pre>
- *
- * Cordova xml configuration: Cordova uses a configuration file at
+ * 
+ * Cordova xml configuration: Cordova uses a configuration file at 
 * res/xml/config.xml to specify its settings. See "The config.xml File"
 * guide in cordova-docs at http://cordova.apache.org/docs for the documentation
 * for the configuration. The use of the set*Property() methods is
@@ -103,27 +104,21 @@ public class CordovaActivity extends Activity {
     */
    @Override
    public void onCreate(Bundle savedInstanceState) {
-        // need to activate preferences before super.onCreate to avoid "requestFeature() must be called before adding content" exception
-        loadConfig();
-
-        String logLevel = preferences.getString("loglevel", "ERROR");
-        LOG.setLogLevel(logLevel);
-
        LOG.i(TAG, "Apache Cordova native platform version " + CordovaWebView.CORDOVA_VERSION + " is starting");
        LOG.d(TAG, "CordovaActivity.onCreate()");

+        // need to activate preferences before super.onCreate to avoid "requestFeature() must be called before adding content" exception
+        loadConfig();
        if (!preferences.getBoolean("ShowTitle", false)) {
            getWindow().requestFeature(Window.FEATURE_NO_TITLE);
        }

        if (preferences.getBoolean("SetFullscreen", false)) {
-            LOG.d(TAG, "The SetFullscreen configuration is deprecated in favor of Fullscreen, and will be removed in a future version.");
+            Log.d(TAG, "The SetFullscreen configuration is deprecated in favor of Fullscreen, and will be removed in a future version.");
            preferences.set("Fullscreen", true);
        }
        if (preferences.getBoolean("Fullscreen", false)) {
-            // NOTE: use the FullscreenNotImmersive configuration key to set the activity in a REAL full screen
-            // (as was the case in previous cordova versions)
-            if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) && !preferences.getBoolean("FullscreenNotImmersive", false)) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
                immersiveMode = true;
            } else {
                getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
@@ -180,14 +175,9 @@ public class CordovaActivity extends Activity {
        setContentView(appView.getView());

        if (preferences.contains("BackgroundColor")) {
-            try {
-                int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
-                // Background of activity:
-                appView.getView().setBackgroundColor(backgroundColor);
-            }
-            catch (NumberFormatException e){
-                e.printStackTrace();
-            }
+            int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
+            // Background of activity:
+            appView.getView().setBackgroundColor(backgroundColor);
        }

        appView.getView().requestFocusFromTouch();
--- a/framework/src/org/apache/cordova/CordovaBridge.java
+++ b/framework/src/org/apache/cordova/CordovaBridge.java
@@ -23,6 +23,8 @@ import java.security.SecureRandom;
 import org.json.JSONArray;
 import org.json.JSONException;

+import android.util.Log;
+
 /**
 * Contains APIs that the JS can call. All functions in here should also have
 * an equivalent entry in CordovaChromeClient.java, and be added to
@@ -85,15 +87,15 @@ public class CordovaBridge {
    private boolean verifySecret(String action, int bridgeSecret) throws IllegalAccessException {
        if (!jsMessageQueue.isBridgeEnabled()) {
            if (bridgeSecret == -1) {
-                LOG.d(LOG_TAG, action + " call made before bridge was enabled.");
+                Log.d(LOG_TAG, action + " call made before bridge was enabled.");
            } else {
-                LOG.d(LOG_TAG, "Ignoring " + action + " from previous page load.");
+                Log.d(LOG_TAG, "Ignoring " + action + " from previous page load.");
            }
            return false;
        }
        // Bridge secret wrong and bridge not due to it being from the previous page.
        if (expectedBridgeSecret < 0 || bridgeSecret != expectedBridgeSecret) {
-            LOG.e(LOG_TAG, "Bridge access attempt with wrong secret token, possibly from malicious code. Disabling exec() bridge!");
+            Log.e(LOG_TAG, "Bridge access attempt with wrong secret token, possibly from malicious code. Disabling exec() bridge!");
            clearBridgeSecret();
            throw new IllegalAccessException();
        }
@@ -118,7 +120,7 @@ public class CordovaBridge {

    public void reset() {
        jsMessageQueue.reset();
-        clearBridgeSecret();
+        clearBridgeSecret();        
    }

    public String promptOnJsPrompt(String origin, String message, String defaultValue) {
@@ -139,7 +141,7 @@ public class CordovaBridge {
            }
            return "";
        }
-        // Sets the native->JS bridge mode.
+        // Sets the native->JS bridge mode. 
        else if (defaultValue != null && defaultValue.startsWith("gap_bridge_mode:")) {
            try {
                int bridgeSecret = Integer.parseInt(defaultValue.substring(16));
@@ -151,7 +153,7 @@ public class CordovaBridge {
            }
            return "";
        }
-        // Polling for JavaScript messages
+        // Polling for JavaScript messages 
        else if (defaultValue != null && defaultValue.startsWith("gap_poll:")) {
            int bridgeSecret = Integer.parseInt(defaultValue.substring(9));
            try {
@@ -173,7 +175,7 @@ public class CordovaBridge {
                int secret = generateBridgeSecret();
                return ""+secret;
            } else {
-                LOG.e(LOG_TAG, "gap_init called from restricted origin: " + origin);
+                Log.e(LOG_TAG, "gap_init called from restricted origin: " + origin);
            }
            return "";
        }
--- a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
+++ b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 import android.util.Pair;

 import org.json.JSONException;
@@ -146,13 +147,13 @@ public class CordovaInterfaceImpl implements CordovaInterface {
        activityResultCallback = null;

        if (callback != null) {
-            LOG.d(TAG, "Sending activity result to plugin");
+            Log.d(TAG, "Sending activity result to plugin");
            initCallbackService = null;
            savedResult = null;
            callback.onActivityResult(requestCode, resultCode, intent);
            return true;
        }
-        LOG.w(TAG, "Got an activity result, but no plugin was registered to receive it" + (savedResult != null ? " yet!" : "."));
+        Log.w(TAG, "Got an activity result, but no plugin was registered to receive it" + (savedResult != null ? " yet!" : "."));
        return false;
    }

--- 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.2.3";
+    public static final String CORDOVA_VERSION = "5.2.1";

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

--- a/framework/src/org/apache/cordova/CordovaWebViewEngine.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewEngine.java
@@ -20,7 +20,6 @@ package org.apache.cordova;

 import android.view.KeyEvent;
 import android.view.View;
-import android.webkit.ValueCallback;

 /**
 * Interface for all Cordova engines.
@@ -59,9 +58,6 @@ public interface CordovaWebViewEngine {
    /** Clean up all resources associated with the WebView. */
    void destroy();

-    /** Add the evaulate Javascript method **/
-    void evaluateJavascript(String js, ValueCallback<String> callback);
-
    /**
     * Used to retrieve the associated CordovaWebView given a View without knowing the type of Engine.
     * E.g. ((CordovaWebView.EngineView)activity.findViewById(android.R.id.webView)).getCordovaWebView();
--- a/framework/src/org/apache/cordova/CordovaWebViewImpl.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewImpl.java
@@ -21,6 +21,7 @@ package org.apache.cordova;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
@@ -244,7 +245,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
    @Deprecated
    public void showCustomView(View view, WebChromeClient.CustomViewCallback callback) {
        // This code is adapted from the original Android Browser code, licensed under the Apache License, Version 2.0
-        LOG.d(TAG, "showing Custom View");
+        Log.d(TAG, "showing Custom View");
        // if a view already exists then immediately terminate the new one
        if (mCustomView != null) {
            callback.onCustomViewHidden();
@@ -275,7 +276,7 @@ public class CordovaWebViewImpl implements CordovaWebView {
    public void hideCustomView() {
        // This code is adapted from the original Android Browser code, licensed under the Apache License, Version 2.0
        if (mCustomView == null) return;
-        LOG.d(TAG, "Hiding Custom View");
+        Log.d(TAG, "Hiding Custom View");

        // Hide the custom view.
        mCustomView.setVisibility(View.GONE);
--- a/framework/src/org/apache/cordova/CoreAndroid.java
+++ b/framework/src/org/apache/cordova/CoreAndroid.java
@@ -30,13 +30,12 @@ import android.content.IntentFilter;
 import android.telephony.TelephonyManager;
 import android.view.KeyEvent;

-import java.lang.reflect.Field;
 import java.util.HashMap;

 /**
 * This class exposes methods in Cordova that can be called from JavaScript.
 */
-public class CoreAndroid extends CordovaPlugin {
+class CoreAndroid extends CordovaPlugin {

    public static final String PLUGIN_NAME = "CoreAndroid";
    protected static final String TAG = "CordovaApp";
@@ -358,33 +357,4 @@ public class CoreAndroid extends CordovaPlugin {
            }
        }
    }
-
-      /*
-     * This needs to be implemented if you wish to use the Camera Plugin or other plugins
-     * that read the Build Configuration.
-     *
-     * Thanks to Phil@Medtronic and Graham Borland for finding the answer and posting it to
-     * StackOverflow.  This is annoying as hell!
-     *
-     */
-
-    public static Object getBuildConfigValue(Context ctx, String key)
-    {
-        try
-        {
-            Class<?> clazz = Class.forName(ctx.getPackageName() + ".BuildConfig");
-            Field field = clazz.getField(key);
-            return field.get(null);
-        } catch (ClassNotFoundException e) {
-            LOG.d(TAG, "Unable to get the BuildConfig, is this built with ANT?");
-            e.printStackTrace();
-        } catch (NoSuchFieldException e) {
-            LOG.d(TAG, key + " is not a valid field. Check your build.gradle");
-        } catch (IllegalAccessException e) {
-            LOG.d(TAG, "Illegal Access Exception: Let's print a stack trace.");
-            e.printStackTrace();
-        }
-
-        return null;
-    }
 }
--- a/framework/src/org/apache/cordova/LOG.java
+++ b/framework/src/org/apache/cordova/LOG.java
@@ -154,16 +154,6 @@ public class LOG {
        if (LOG.INFO >= LOGLEVEL) Log.i(tag, s, e);
    }

-    /**
-     * Warning log message.
-     *
-     * @param tag
-     * @param e
-     */
-    public static void w(String tag, Throwable e) {
-        if (LOG.WARN >= LOGLEVEL) Log.w(tag, e);
-    }
-
    /**
     * Warning log message.
     *
--- a/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
+++ b/framework/src/org/apache/cordova/NativeToJsMessageQueue.java
@@ -21,6 +21,8 @@ package org.apache.cordova;
 import java.util.ArrayList;
 import java.util.LinkedList;

+import android.util.Log;
+
 /**
 * Holds the list of messages to be sent to the WebView.
 */
@@ -40,13 +42,13 @@ public class NativeToJsMessageQueue {
    // This currently only chops up on message boundaries. It may be useful
    // to allow it to break up messages.
    private static int MAX_PAYLOAD_SIZE = 50 * 1024 * 10240;
-
+    
    /**
     * When true, the active listener is not fired upon enqueue. When set to false,
-     * the active listener will be fired if the queue is non-empty.
+     * the active listener will be fired if the queue is non-empty. 
     */
    private boolean paused;
-
+    
    /**
     * The list of JavaScript statements to be sent to JavaScript.
     */
@@ -56,7 +58,7 @@ public class NativeToJsMessageQueue {
     * The array of listeners that can be used to send messages to JS.
     */
    private ArrayList<BridgeMode> bridgeModes = new ArrayList<BridgeMode>();
-
+    
    /**
     * When null, the bridge is disabled. This occurs during page transitions.
     * When disabled, all callbacks are dropped since they are assumed to be
@@ -81,11 +83,11 @@ public class NativeToJsMessageQueue {
     */
    public void setBridgeMode(int value) {
        if (value < -1 || value >= bridgeModes.size()) {
-            LOG.d(LOG_TAG, "Invalid NativeToJsBridgeMode: " + value);
+            Log.d(LOG_TAG, "Invalid NativeToJsBridgeMode: " + value);
        } else {
            BridgeMode newMode = value < 0 ? null : bridgeModes.get(value);
            if (newMode != activeBridgeMode) {
-                LOG.d(LOG_TAG, "Set native->JS mode to " + (newMode == null ? "null" : newMode.getClass().getSimpleName()));
+                Log.d(LOG_TAG, "Set native->JS mode to " + (newMode == null ? "null" : newMode.getClass().getSimpleName()));
                synchronized (this) {
                    activeBridgeMode = newMode;
                    if (newMode != null) {
@@ -98,7 +100,7 @@ public class NativeToJsMessageQueue {
            }
        }
    }
-
+    
    /**
     * Clears all messages and resets to the default bridge mode.
     */
@@ -112,16 +114,16 @@ public class NativeToJsMessageQueue {
    private int calculatePackedMessageLength(JsMessage message) {
        int messageLen = message.calculateEncodedLength();
        String messageLenStr = String.valueOf(messageLen);
-        return messageLenStr.length() + messageLen + 1;
+        return messageLenStr.length() + messageLen + 1;        
    }
-
+    
    private void packMessage(JsMessage message, StringBuilder sb) {
        int len = message.calculateEncodedLength();
        sb.append(len)
          .append(' ');
        message.encodeAsMessage(sb);
    }
-
+    
    /**
     * Combines and returns queued messages combined into a single string.
     * Combines as many messages as possible, while staying under MAX_PAYLOAD_SIZE.
@@ -152,7 +154,7 @@ public class NativeToJsMessageQueue {
                JsMessage message = queue.removeFirst();
                packMessage(message, sb);
            }
-
+            
            if (!queue.isEmpty()) {
                // Attach a char to indicate that there are more messages pending.
                sb.append('*');
@@ -161,7 +163,7 @@ public class NativeToJsMessageQueue {
            return ret;
        }
    }
-
+    
    /**
     * Same as popAndEncode(), except encodes in a form that can be executed as JS.
     */
@@ -183,7 +185,7 @@ public class NativeToJsMessageQueue {
            }
            boolean willSendAllMessages = numMessagesToSend == queue.size();
            StringBuilder sb = new StringBuilder(totalPayloadLen + (willSendAllMessages ? 0 : 100));
-            // Wrap each statement in a try/finally so that if one throws it does
+            // Wrap each statement in a try/finally so that if one throws it does 
            // not affect the next.
            for (int i = 0; i < numMessagesToSend; ++i) {
                JsMessage message = queue.removeFirst();
@@ -204,7 +206,7 @@ public class NativeToJsMessageQueue {
            String ret = sb.toString();
            return ret;
        }
-    }
+    }   

    /**
     * Add a JavaScript statement to the list.
@@ -218,7 +220,7 @@ public class NativeToJsMessageQueue {
     */
    public void addPluginResult(PluginResult result, String callbackId) {
        if (callbackId == null) {
-            LOG.e(LOG_TAG, "Got plugin result with no callbackId", new Throwable());
+            Log.e(LOG_TAG, "Got plugin result with no callbackId", new Throwable());
            return;
        }
        // Don't send anything if there is no result and there is no need to
@@ -241,7 +243,7 @@ public class NativeToJsMessageQueue {
    private void enqueueMessage(JsMessage message) {
        synchronized (this) {
            if (activeBridgeMode == null) {
-                LOG.d(LOG_TAG, "Dropping Native->JS message due to disabled bridge");
+                Log.d(LOG_TAG, "Dropping Native->JS message due to disabled bridge");
                return;
            }
            queue.add(message);
@@ -255,7 +257,7 @@ public class NativeToJsMessageQueue {
        if (paused && value) {
            // This should never happen. If a use-case for it comes up, we should
            // change pause to be a counter.
-            LOG.e(LOG_TAG, "nested call to setPaused detected.", new Throwable());
+            Log.e(LOG_TAG, "nested call to setPaused detected.", new Throwable());
        }
        paused = value;
        if (!value) {
@@ -263,7 +265,7 @@ public class NativeToJsMessageQueue {
                if (!queue.isEmpty() && activeBridgeMode != null) {
                    activeBridgeMode.onNativeToJsMessageAvailable(this);
                }
-            }
+            }   
        }
    }

@@ -349,31 +351,6 @@ public class NativeToJsMessageQueue {
        }
    }

-    /** Uses webView.evaluateJavascript to execute messages. */
-    public static class EvalBridgeMode extends BridgeMode {
-        private final CordovaWebViewEngine engine;
-        private final CordovaInterface cordova;
-
-        public EvalBridgeMode(CordovaWebViewEngine engine, CordovaInterface cordova) {
-            this.engine = engine;
-            this.cordova = cordova;
-        }
-
-        @Override
-        public void onNativeToJsMessageAvailable(final NativeToJsMessageQueue queue) {
-            cordova.getActivity().runOnUiThread(new Runnable() {
-                public void run() {
-                    String js = queue.popAndEncodeAsJs();
-                    if (js != null) {
-                        engine.evaluateJavascript(js, null);
-                    }
-                }
-            });
-        }
-    }
-
-
-
    private static class JsMessage {
        final String jsPayloadOrCallbackId;
        final PluginResult pluginResult;
@@ -391,7 +368,7 @@ public class NativeToJsMessageQueue {
            jsPayloadOrCallbackId = callbackId;
            this.pluginResult = pluginResult;
        }
-
+        
        static int calculateEncodedLengthHelper(PluginResult pluginResult) {
            switch (pluginResult.getMessageType()) {
                case PluginResult.MESSAGE_TYPE_BOOLEAN: // f or t
@@ -418,7 +395,7 @@ public class NativeToJsMessageQueue {
                    return pluginResult.getMessage().length();
            }
        }
-
+        
        int calculateEncodedLength() {
            if (pluginResult == null) {
                return jsPayloadOrCallbackId.length() + 1;
@@ -447,7 +424,7 @@ public class NativeToJsMessageQueue {
                case PluginResult.MESSAGE_TYPE_BINARYSTRING: // S
                    sb.append('S');
                    sb.append(pluginResult.getMessage());
-                    break;
+                    break;                    
                case PluginResult.MESSAGE_TYPE_ARRAYBUFFER: // A
                    sb.append('A');
                    sb.append(pluginResult.getMessage());
@@ -466,7 +443,7 @@ public class NativeToJsMessageQueue {
                    sb.append(pluginResult.getMessage()); // [ or {
            }
        }
-
+        
        void encodeAsMessage(StringBuilder sb) {
            if (pluginResult == null) {
                sb.append('J')
@@ -488,34 +465,6 @@ public class NativeToJsMessageQueue {
            encodeAsMessageHelper(sb, pluginResult);
        }

-        void buildJsMessage(StringBuilder sb) {
-            switch (pluginResult.getMessageType()) {
-                case PluginResult.MESSAGE_TYPE_MULTIPART:
-                    int size = pluginResult.getMultipartMessagesSize();
-                    for (int i=0; i<size; i++) {
-                        PluginResult subresult = pluginResult.getMultipartMessage(i);
-                        JsMessage submessage = new JsMessage(subresult, jsPayloadOrCallbackId);
-                        submessage.buildJsMessage(sb);
-                        if (i < (size-1)) {
-                            sb.append(",");
-                        }
-                    }
-                    break;
-                case PluginResult.MESSAGE_TYPE_BINARYSTRING:
-                    sb.append("atob('")
-                            .append(pluginResult.getMessage())
-                            .append("')");
-                    break;
-                case PluginResult.MESSAGE_TYPE_ARRAYBUFFER:
-                    sb.append("cordova.require('cordova/base64').toArrayBuffer('")
-                            .append(pluginResult.getMessage())
-                            .append("')");
-                    break;
-                default:
-                    sb.append(pluginResult.getMessage());
-            }
-        }
-
        void encodeAsJsMessage(StringBuilder sb) {
            if (pluginResult == null) {
                sb.append(jsPayloadOrCallbackId);
@@ -523,16 +472,29 @@ public class NativeToJsMessageQueue {
                int status = pluginResult.getStatus();
                boolean success = (status == PluginResult.Status.OK.ordinal()) || (status == PluginResult.Status.NO_RESULT.ordinal());
                sb.append("cordova.callbackFromNative('")
-                        .append(jsPayloadOrCallbackId)
-                        .append("',")
-                        .append(success)
-                        .append(",")
-                        .append(status)
-                        .append(",[");
-                buildJsMessage(sb);
+                  .append(jsPayloadOrCallbackId)
+                  .append("',")
+                  .append(success)
+                  .append(",")
+                  .append(status)
+                  .append(",[");
+                switch (pluginResult.getMessageType()) {
+                    case PluginResult.MESSAGE_TYPE_BINARYSTRING:
+                        sb.append("atob('")
+                          .append(pluginResult.getMessage())
+                          .append("')");
+                        break;
+                    case PluginResult.MESSAGE_TYPE_ARRAYBUFFER:
+                        sb.append("cordova.require('cordova/base64').toArrayBuffer('")
+                          .append(pluginResult.getMessage())
+                          .append("')");
+                        break;
+                    default:
+                    sb.append(pluginResult.getMessage());
+                }
                sb.append("],")
-                        .append(pluginResult.getKeepCallback())
-                        .append(");");
+                  .append(pluginResult.getKeepCallback())
+                  .append(");");
            }
        }
    }
--- a/framework/src/org/apache/cordova/PluginManager.java
+++ b/framework/src/org/apache/cordova/PluginManager.java
@@ -28,6 +28,7 @@ import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Debug;
+import android.util.Log;

 /**
 * PluginManager is exposed to JavaScript in the Cordova WebView.
@@ -121,7 +122,7 @@ public class PluginManager {
    public void exec(final String service, final String action, final String callbackId, final String rawArgs) {
        CordovaPlugin plugin = getPlugin(service);
        if (plugin == null) {
-            LOG.d(TAG, "exec() call to unknown plugin: " + service);
+            Log.d(TAG, "exec() call to unknown plugin: " + service);
            PluginResult cr = new PluginResult(PluginResult.Status.CLASS_NOT_FOUND_EXCEPTION);
            app.sendPluginResult(cr, callbackId);
            return;
@@ -133,7 +134,7 @@ public class PluginManager {
            long duration = System.currentTimeMillis() - pluginStartTime;

            if (duration > SLOW_EXEC_WARNING_THRESHOLD) {
-                LOG.w(TAG, "THREAD WARNING: exec() call to " + service + "." + action + " blocked the main thread for " + duration + "ms. Plugin should use CordovaInterface.getThreadPool().");
+                Log.w(TAG, "THREAD WARNING: exec() call to " + service + "." + action + " blocked the main thread for " + duration + "ms. Plugin should use CordovaInterface.getThreadPool().");
            }
            if (!wasValidAction) {
                PluginResult cr = new PluginResult(PluginResult.Status.INVALID_ACTION);
@@ -143,7 +144,7 @@ public class PluginManager {
            PluginResult cr = new PluginResult(PluginResult.Status.JSON_EXCEPTION);
            callbackContext.sendPluginResult(cr);
        } catch (Exception e) {
-            LOG.e(TAG, "Uncaught exception from plugin", e);
+            Log.e(TAG, "Uncaught exception from plugin", e);
            callbackContext.error(e.getMessage());
        }
    }
@@ -221,9 +222,9 @@ public class PluginManager {
     * @param handler           The HttpAuthHandler used to set the WebView's response
     * @param host              The host requiring authentication
     * @param realm             The realm for which authentication is required
-     *
+     * 
     * @return                  Returns True if there is a plugin which will resolve this auth challenge, otherwise False
-     *
+     * 
     */
    public boolean onReceivedHttpAuthRequest(CordovaWebView view, ICordovaHttpAuthHandler handler, String host, String realm) {
        for (CordovaPlugin plugin : this.pluginMap.values()) {
@@ -233,7 +234,7 @@ public class PluginManager {
        }
        return false;
    }
-
+    
    /**
     * Called when he system received an SSL client certificate request.  Plugin can use
     * the supplied ClientCertRequest to process this certificate challenge.
--- a/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebChromeClient.java
@@ -26,6 +26,7 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
@@ -61,7 +62,7 @@ public class SystemWebChromeClient extends WebChromeClient {

    // the video progress view
    private View mVideoProgressView;
-
+    
    private CordovaDialogsHelper dialogsHelper;
    private Context appContext;

@@ -192,7 +193,7 @@ public class SystemWebChromeClient extends WebChromeClient {
        }

    }
-
+    
    // API level 7 is required for this, see if we could lower this using something else
    @Override
    public void onShowCustomView(View view, WebChromeClient.CustomViewCallback callback) {
@@ -212,9 +213,9 @@ public class SystemWebChromeClient extends WebChromeClient {
     */
    public View getVideoLoadingProgressView() {

-        if (mVideoProgressView == null) {
+        if (mVideoProgressView == null) {            
            // Create a new Loading view programmatically.
-
+            
            // create the linear layout
            LinearLayout layout = new LinearLayout(parentEngine.getView().getContext());
            layout.setOrientation(LinearLayout.VERTICAL);
@@ -225,12 +226,12 @@ public class SystemWebChromeClient extends WebChromeClient {
            ProgressBar bar = new ProgressBar(parentEngine.getView().getContext());
            LinearLayout.LayoutParams barLayoutParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
            barLayoutParams.gravity = Gravity.CENTER;
-            bar.setLayoutParams(barLayoutParams);
+            bar.setLayoutParams(barLayoutParams);   
            layout.addView(bar);
-
+            
            mVideoProgressView = layout;
        }
-    return mVideoProgressView;
+    return mVideoProgressView; 
    }

    // <input type=file> support:
@@ -239,11 +240,11 @@ public class SystemWebChromeClient extends WebChromeClient {
    public void openFileChooser(ValueCallback<Uri> uploadMsg) {
        this.openFileChooser(uploadMsg, "*/*");
    }
-
+    
    public void openFileChooser( ValueCallback<Uri> uploadMsg, String acceptType ) {
        this.openFileChooser(uploadMsg, acceptType, null);
    }
-
+    
    public void openFileChooser(final ValueCallback<Uri> uploadMsg, String acceptType, String capture)
    {
        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
@@ -253,7 +254,7 @@ public class SystemWebChromeClient extends WebChromeClient {
            @Override
            public void onActivityResult(int requestCode, int resultCode, Intent intent) {
                Uri result = intent == null || resultCode != Activity.RESULT_OK ? null : intent.getData();
-                LOG.d(LOG_TAG, "Receive file chooser URL: " + result);
+                Log.d(LOG_TAG, "Receive file chooser URL: " + result);
                uploadMsg.onReceiveValue(result);
            }
        }, intent, FILECHOOSER_RESULTCODE);
@@ -268,12 +269,12 @@ public class SystemWebChromeClient extends WebChromeClient {
                @Override
                public void onActivityResult(int requestCode, int resultCode, Intent intent) {
                    Uri[] result = WebChromeClient.FileChooserParams.parseResult(resultCode, intent);
-                    LOG.d(LOG_TAG, "Receive file chooser URL: " + result);
+                    Log.d(LOG_TAG, "Receive file chooser URL: " + result);
                    filePathsCallback.onReceiveValue(result);
                }
            }, intent, FILECHOOSER_RESULTCODE);
        } catch (ActivityNotFoundException e) {
-            LOG.w("No activity found to handle file chooser intent.", e);
+            Log.w("No activity found to handle file chooser intent.", e);
            filePathsCallback.onReceiveValue(null);
        }
        return true;
@@ -282,7 +283,7 @@ public class SystemWebChromeClient extends WebChromeClient {
    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
    @Override
    public void onPermissionRequest(final PermissionRequest request) {
-        LOG.d(LOG_TAG, "onPermissionRequest: " + Arrays.toString(request.getResources()));
+        Log.d(LOG_TAG, "onPermissionRequest: " + Arrays.toString(request.getResources()));
        request.grant(request.getResources());
    }

--- a/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
+++ b/framework/src/org/apache/cordova/engine/SystemWebViewEngine.java
@@ -27,8 +27,8 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.os.Build;
+import android.util.Log;
 import android.view.View;
-import android.webkit.ValueCallback;
 import android.webkit.WebSettings;
 import android.webkit.WebSettings.LayoutAlgorithm;
 import android.webkit.WebView;
@@ -40,7 +40,6 @@ import org.apache.cordova.CordovaResourceApi;
 import org.apache.cordova.CordovaWebView;
 import org.apache.cordova.CordovaWebViewEngine;
 import org.apache.cordova.ICordovaCookieManager;
-import org.apache.cordova.LOG;
 import org.apache.cordova.NativeToJsMessageQueue;
 import org.apache.cordova.PluginManager;

@@ -117,9 +116,7 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
                SystemWebViewEngine.this.cordova.getActivity().runOnUiThread(r);
            }
        }));
-        if(Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2)
-            nativeToJsMessageQueue.addBridgeMode(new NativeToJsMessageQueue.EvalBridgeMode(this, cordova));
-	bridge = new CordovaBridge(pluginManager, nativeToJsMessageQueue);
+        bridge = new CordovaBridge(pluginManager, nativeToJsMessageQueue);
        exposeJsInterface(webView, bridge);
    }

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

        //We don't save any form data in the application
        settings.setSaveFormData(false);
        settings.setSavePassword(false);
-
+        
        // Jellybean rightfully tried to lock this down. Too bad they didn't give us a whitelist
        // while we do this
        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
@@ -187,15 +184,15 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
        String databasePath = webView.getContext().getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath();
        settings.setDatabaseEnabled(true);
        settings.setDatabasePath(databasePath);
-
-
+        
+        
        //Determine whether we're in debug or release mode, and turn on Debugging!
        ApplicationInfo appInfo = webView.getContext().getApplicationContext().getApplicationInfo();
        if ((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0 &&
            android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
            enableRemoteDebugging();
        }
-
+        
        settings.setGeolocationDatabasePath(databasePath);

        // Enable DOM storage
@@ -203,18 +200,13 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {

        // Enable built-in geolocation
        settings.setGeolocationEnabled(true);
-
+        
        // Enable AppCache
        // Fix for CB-2282
        settings.setAppCacheMaxSize(5 * 1048576);
        settings.setAppCachePath(databasePath);
        settings.setAppCacheEnabled(true);
-
-        // Enable scaling
-        // Fix for CB-12015
-        settings.setUseWideViewPort(true);
-        settings.setLoadWithOverviewMode(true);
-
+        
        // Fix for CB-1405
        // Google issue 4641
        String defaultUserAgent = settings.getUserAgentString();
@@ -230,7 +222,7 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
            }
        }
        // End CB-3360
-
+        
        IntentFilter intentFilter = new IntentFilter();
        intentFilter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
        if (this.receiver == null) {
@@ -250,18 +242,18 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
        try {
            WebView.setWebContentsDebuggingEnabled(true);
        } catch (IllegalArgumentException e) {
-            LOG.d(TAG, "You have one job! To turn on Remote Web Debugging! YOU HAVE FAILED! ");
+            Log.d(TAG, "You have one job! To turn on Remote Web Debugging! YOU HAVE FAILED! ");
            e.printStackTrace();
        }
    }

    private static void exposeJsInterface(WebView webView, CordovaBridge bridge) {
        if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1)) {
-            LOG.i(TAG, "Disabled addJavascriptInterface() bridge since Android version is old.");
+            Log.i(TAG, "Disabled addJavascriptInterface() bridge since Android version is old.");
            // Bug being that Java Strings do not get converted to JS strings automatically.
            // This isn't hard to work-around on the JS side, but it's easier to just
            // use the prompt bridge instead.
-            return;
+            return;            
        }
        SystemExposedJsApi exposedJsApi = new SystemExposedJsApi(bridge);
        webView.addJavascriptInterface(exposedJsApi, "_cordovaNative");
@@ -320,10 +312,8 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
    @Override
    public void setPaused(boolean value) {
        if (value) {
-            webView.onPause();
            webView.pauseTimers();
        } else {
-            webView.onResume();
            webView.resumeTimers();
        }
    }
@@ -337,19 +327,8 @@ public class SystemWebViewEngine implements CordovaWebViewEngine {
            try {
                webView.getContext().unregisterReceiver(receiver);
            } catch (Exception e) {
-                LOG.e(TAG, "Error unregistering configuration receiver: " + e.getMessage(), e);
+                Log.e(TAG, "Error unregistering configuration receiver: " + e.getMessage(), e);
            }
        }
    }
-
-    @Override
-    public void evaluateJavascript(String js, ValueCallback<String> callback) {
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            webView.evaluateJavascript(js, callback);
-        }
-        else
-        {
-            LOG.d(TAG, "This webview is using the old bridge");
-        }
-    }
 }
--- a/node_modules/.bin/nopt
+++ b/node_modules/.bin/nopt
@@ -1 +1,15 @@
-../nopt/bin/nopt.js
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../nopt/bin/nopt.js" "$@"
+  ret=$?
+else 
+  node  "$basedir/../nopt/bin/nopt.js" "$@"
+  ret=$?
+fi
+exit $ret
--- a/node_modules/.bin/nopt.cmd
+++ b/node_modules/.bin/nopt.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\nopt\bin\nopt.js" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\nopt\bin\nopt.js" %*
+)
--- a/node_modules/.bin/semver
+++ b/node_modules/.bin/semver
@@ -1 +1,15 @@
-../semver/bin/semver
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../semver/bin/semver" "$@"
+  ret=$?
+else 
+  node  "$basedir/../semver/bin/semver" "$@"
+  ret=$?
+fi
+exit $ret
--- a/node_modules/.bin/semver.cmd
+++ b/node_modules/.bin/semver.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\semver\bin\semver" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\semver\bin\semver" %*
+)
--- a/node_modules/.bin/shjs
+++ b/node_modules/.bin/shjs
@@ -1 +1,15 @@
-../shelljs/bin/shjs
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../shelljs/bin/shjs" "$@"
+  ret=$?
+else 
+  node  "$basedir/../shelljs/bin/shjs" "$@"
+  ret=$?
+fi
+exit $ret
--- a/node_modules/.bin/shjs.cmd
+++ b/node_modules/.bin/shjs.cmd
@@ -0,0 +1,7 @@
+@IF EXIST "%~dp0\node.exe" (
+  "%~dp0\node.exe"  "%~dp0\..\shelljs\bin\shjs" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.JS;=;%
+  node  "%~dp0\..\shelljs\bin\shjs" %*
+)
--- a/node_modules/abbrev/abbrev.js
+++ b/node_modules/abbrev/abbrev.js
@@ -1,3 +1,4 @@
+
 module.exports = exports = abbrev.abbrev = abbrev

 abbrev.monkeyPatch = monkeyPatch
--- a/node_modules/abbrev/package.json
+++ b/node_modules/abbrev/package.json
@@ -10,23 +10,24 @@
        "spec": ">=1.0.0 <2.0.0",
        "type": "range"
      },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt"
+      "d:\\cordova\\cordova-android\\node_modules\\nopt"
    ]
  ],
  "_from": "abbrev@>=1.0.0 <2.0.0",
-  "_id": "abbrev@1.1.0",
+  "_id": "abbrev@1.0.9",
  "_inCache": true,
+  "_installable": true,
  "_location": "/abbrev",
-  "_nodeVersion": "8.0.0-pre",
+  "_nodeVersion": "4.4.4",
  "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/abbrev-1.1.0.tgz_1487054000015_0.9229173036292195"
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/abbrev-1.0.9.tgz_1466016055839_0.7825860097073019"
  },
  "_npmUser": {
    "name": "isaacs",
    "email": "i@izs.me"
  },
-  "_npmVersion": "4.3.0",
+  "_npmVersion": "3.9.1",
  "_phantomChildren": {},
  "_requested": {
    "raw": "abbrev@1",
@@ -40,11 +41,11 @@
  "_requiredBy": [
    "/nopt"
  ],
-  "_resolved": "http://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-  "_shasum": "d0554c2256636e2f56e7c2e5ad183f859428d81f",
+  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+  "_shasum": "91b4792588a7738c25f35dd6f63752a2f8776135",
  "_shrinkwrap": null,
  "_spec": "abbrev@1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/nopt",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\nopt",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me"
@@ -55,17 +56,17 @@
  "dependencies": {},
  "description": "Like ruby's abbrev module, but in js",
  "devDependencies": {
-    "tap": "^10.1"
+    "tap": "^5.7.2"
  },
  "directories": {},
  "dist": {
-    "shasum": "d0554c2256636e2f56e7c2e5ad183f859428d81f",
-    "tarball": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"
+    "shasum": "91b4792588a7738c25f35dd6f63752a2f8776135",
+    "tarball": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
  },
  "files": [
    "abbrev.js"
  ],
-  "gitHead": "7136d4d95449dc44115d4f78b80ec907724f64e0",
+  "gitHead": "c386cd9dbb1d8d7581718c54d4ba944cc9298d6f",
  "homepage": "https://github.com/isaacs/abbrev-js#readme",
  "license": "ISC",
  "main": "abbrev.js",
@@ -83,10 +84,7 @@
    "url": "git+ssh://git@github.com/isaacs/abbrev-js.git"
  },
  "scripts": {
-    "postpublish": "git push origin --all; git push origin --tags",
-    "postversion": "npm publish",
-    "preversion": "npm test",
-    "test": "tap test.js --100"
+    "test": "tap test.js --cov"
  },
-  "version": "1.1.0"
+  "version": "1.0.9"
 }
--- a/node_modules/ansi/package.json
+++ b/node_modules/ansi/package.json
@@ -10,12 +10,13 @@
        "spec": ">=0.3.1 <0.4.0",
        "type": "range"
      },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "ansi@>=0.3.1 <0.4.0",
  "_id": "ansi@0.3.1",
  "_inCache": true,
+  "_installable": true,
  "_location": "/ansi",
  "_nodeVersion": "5.3.0",
  "_npmUser": {
@@ -36,11 +37,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": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
    "name": "Nathan Rajlich",
    "email": "nathan@tootallnate.net",
--- a/node_modules/balanced-match/README.md
+++ b/node_modules/balanced-match/README.md
@@ -47,7 +47,7 @@ object with those keys:

 If there's no match, `undefined` will be returned.

-If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']` and `{a}}` will match `['', 'a', '}']`.
+If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`.

 ### var r = balanced.range(a, b, str)

@@ -56,7 +56,7 @@ array with indexes: `[ <a index>, <b index> ]`.

 If there's no match, `undefined` will be returned.

-If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `[ 1, 3 ]` and `{a}}` will match `[0, 2]`.
+If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `[ 1, 3 ]`.

 ## Installation

--- a/node_modules/balanced-match/index.js
+++ b/node_modules/balanced-match/index.js
@@ -30,7 +30,7 @@ function range(a, b, str) {
    begs = [];
    left = str.length;

-    while (i >= 0 && !result) {
+    while (i < str.length && i >= 0 && ! result) {
      if (i == ai) {
        begs.push(i);
        ai = str.indexOf(a, i + 1);
--- a/node_modules/balanced-match/package.json
+++ b/node_modules/balanced-match/package.json
@@ -10,23 +10,24 @@
        "spec": ">=0.4.1 <0.5.0",
        "type": "range"
      },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion"
+      "d:\\cordova\\cordova-android\\node_modules\\brace-expansion"
    ]
  ],
  "_from": "balanced-match@>=0.4.1 <0.5.0",
-  "_id": "balanced-match@0.4.2",
+  "_id": "balanced-match@0.4.1",
  "_inCache": true,
+  "_installable": true,
  "_location": "/balanced-match",
-  "_nodeVersion": "4.4.7",
+  "_nodeVersion": "6.0.0",
  "_npmOperationalInternal": {
-    "host": "packages-16-east.internal.npmjs.com",
-    "tmp": "tmp/balanced-match-0.4.2.tgz_1468834991581_0.6590619895141572"
+    "host": "packages-12-west.internal.npmjs.com",
+    "tmp": "tmp/balanced-match-0.4.1.tgz_1462129663650_0.39764496590942144"
  },
  "_npmUser": {
    "name": "juliangruber",
    "email": "julian@juliangruber.com"
  },
-  "_npmVersion": "2.15.8",
+  "_npmVersion": "3.8.6",
  "_phantomChildren": {},
  "_requested": {
    "raw": "balanced-match@^0.4.1",
@@ -40,11 +41,11 @@
  "_requiredBy": [
    "/brace-expansion"
  ],
-  "_resolved": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-  "_shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838",
+  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz",
+  "_shasum": "19053e2e0748eadb379da6c09d455cf5e1039335",
  "_shrinkwrap": null,
  "_spec": "balanced-match@^0.4.1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\brace-expansion",
  "author": {
    "name": "Julian Gruber",
    "email": "mail@juliangruber.com",
@@ -56,14 +57,14 @@
  "dependencies": {},
  "description": "Match balanced character pairs, like \"{\" and \"}\"",
  "devDependencies": {
-    "tape": "^4.6.0"
+    "tape": "~4.5.0"
  },
  "directories": {},
  "dist": {
-    "shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838",
-    "tarball": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+    "shasum": "19053e2e0748eadb379da6c09d455cf5e1039335",
+    "tarball": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz"
  },
-  "gitHead": "57c2ea29d89a2844ae3bdcc637c6e2cbb73725e2",
+  "gitHead": "7004b289baaaab6a832f4901735e29d37cc2a863",
  "homepage": "https://github.com/juliangruber/balanced-match",
  "keywords": [
    "match",
@@ -106,5 +107,5 @@
      "android-browser/4.2..latest"
    ]
  },
-  "version": "0.4.2"
+  "version": "0.4.1"
 }
--- a/node_modules/base64-js/package.json
+++ b/node_modules/base64-js/package.json
@@ -10,12 +10,13 @@
        "spec": "0.0.8",
        "type": "version"
      },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/plist"
+      "d:\\cordova\\cordova-android\\node_modules\\plist"
    ]
  ],
  "_from": "base64-js@0.0.8",
  "_id": "base64-js@0.0.8",
  "_inCache": true,
+  "_installable": true,
  "_location": "/base64-js",
  "_nodeVersion": "0.10.35",
  "_npmUser": {
@@ -36,11 +37,11 @@
  "_requiredBy": [
    "/plist"
  ],
-  "_resolved": "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+  "_resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
  "_shasum": "1101e9544f4a76b1bc3b26d452ca96d7a35e7978",
  "_shrinkwrap": null,
  "_spec": "base64-js@0.0.8",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/plist",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\plist",
  "author": {
    "name": "T. Jameson Little",
    "email": "t.jameson.little@gmail.com"
--- a/node_modules/big-integer/BigInteger.js
+++ b/node_modules/big-integer/BigInteger.js
@@ -118,7 +118,7 @@ var bigInt = (function (undefined) {
    }

    BigInteger.prototype.add = function (v) {
-        var n = parseValue(v);
+        var value, n = parseValue(v);
        if (this.sign !== n.sign) {
            return this.subtract(n.negate());
        }
@@ -177,7 +177,7 @@ var bigInt = (function (undefined) {
    }

    function subtractAny(a, b, sign) {
-        var value;
+        var value, isSmall;
        if (compareAbs(a, b) >= 0) {
            value = subtract(a,b);
        } else {
@@ -301,7 +301,7 @@ var bigInt = (function (undefined) {

    function multiplyKaratsuba(x, y) {
        var n = Math.max(x.length, y.length);
-
+        
        if (n <= 30) return multiplyLong(x, y);
        n = Math.ceil(n / 2);

@@ -326,7 +326,7 @@ var bigInt = (function (undefined) {
    }

    BigInteger.prototype.multiply = function (v) {
-        var n = parseValue(v),
+        var value, n = parseValue(v),
            a = this.value, b = n.value,
            sign = this.sign !== n.sign,
            abs;
@@ -467,7 +467,6 @@ var bigInt = (function (undefined) {
            guess, xlen, highx, highy, check;
        while (a_l) {
            part.unshift(a[--a_l]);
-            trim(part);
            if (compareAbs(part, b) < 0) {
                result.push(0);
                continue;
@@ -823,29 +822,6 @@ var bigInt = (function (undefined) {
    };
    SmallInteger.prototype.isProbablePrime = BigInteger.prototype.isProbablePrime;

-    BigInteger.prototype.modInv = function (n) {
-        var t = bigInt.zero, newT = bigInt.one, r = parseValue(n), newR = this.abs(), q, lastT, lastR;
-        while (!newR.equals(bigInt.zero)) {
-            q = r.divide(newR);
-            lastT = t;
-            lastR = r;
-            t = newT;
-            r = newR;
-            newT = lastT.subtract(q.multiply(newT));
-            newR = lastR.subtract(q.multiply(newR));
-        }
-        if (!r.equals(1)) throw new Error(this.toString() + " and " + n.toString() + " are not co-prime");
-        if (t.compare(0) === -1) {
-            t = t.add(n);
-        }
-        if (this.isNegative()) {
-            return t.negate();
-        }
-        return t;
-    };
-
-    SmallInteger.prototype.modInv = BigInteger.prototype.modInv;
-
    BigInteger.prototype.next = function () {
        var value = this.value;
        if (this.sign) {
@@ -982,7 +958,7 @@ var bigInt = (function (undefined) {
        b = parseValue(b);
        return a.greater(b) ? a : b;
    }
-    function min(a, b) {
+    function min(a,b) {
        a = parseValue(a);
        b = parseValue(b);
        return a.lesser(b) ? a : b;
@@ -1037,7 +1013,8 @@ var bigInt = (function (undefined) {
        return low.add(typeof result === "number" ? new SmallInteger(result) : new BigInteger(result, false));
    }
    var parseBase = function (text, base) {
-        var length = text.length;
+        var val = Integer[0], pow = Integer[1],
+            length = text.length;
        if (2 <= base && base <= 36) {
            if (length <= LOG_MAX_INT / Math.log(base)) {
                return new SmallInteger(parseInt(text, base));
@@ -1059,17 +1036,13 @@ var bigInt = (function (undefined) {
            }
            else throw new Error(c + " is not a valid character");
        }
-        return parseBaseFromArray(digits, base, isNegative);
-    };
-
-    function parseBaseFromArray(digits, base, isNegative) {
-        var val = Integer[0], pow = Integer[1], i;
-        for (i = digits.length - 1; i >= 0; i--) {
+        digits.reverse();
+        for (i = 0; i < digits.length; i++) {
            val = val.add(digits[i].times(pow));
            pow = pow.times(base);
        }
        return isNegative ? val.negate() : val;
-    }
+    };

    function stringify(digit) {
        var v = digit.value;
@@ -1141,7 +1114,7 @@ var bigInt = (function (undefined) {
        return this.value;
    };
    SmallInteger.prototype.toJSNumber = SmallInteger.prototype.valueOf;
-
+    
    function parseStringValue(v) {
            if (isPrecise(+v)) {
                var x = +v;
@@ -1180,7 +1153,7 @@ var bigInt = (function (undefined) {
            trim(r);
            return new BigInteger(r, sign);
    }
-
+    
    function parseNumberValue(v) {
        if (isPrecise(v)) {
            if (v !== truncate(v)) throw new Error(v + " is not an integer.");
@@ -1213,11 +1186,6 @@ var bigInt = (function (undefined) {
    Integer.lcm = lcm;
    Integer.isInstance = function (x) { return x instanceof BigInteger || x instanceof SmallInteger; };
    Integer.randBetween = randBetween;
-
-    Integer.fromArray = function (digits, base, isNegative) {
-        return parseBaseFromArray(digits.map(parseValue), parseValue(base || 10), isNegative);
-    };
-
    return Integer;
 })();

@@ -1225,10 +1193,3 @@ var bigInt = (function (undefined) {
 if (typeof module !== "undefined" && module.hasOwnProperty("exports")) {
    module.exports = bigInt;
 }
-
-//amd check
-if ( typeof define === "function" && define.amd ) {  
-  define( "big-integer", [], function() {
-    return bigInt;
-  });
-}
--- a/node_modules/big-integer/BigInteger.min.js
+++ b/node_modules/big-integer/BigInteger.min.js
--- a/node_modules/big-integer/README.md
+++ b/node_modules/big-integer/README.md
@@ -280,13 +280,6 @@ Performs division and returns the remainder, disregarding the quotient. The sign
 
 [View benchmarks for this method](http://peterolson.github.io/BigInteger.js/benchmark/#Division)

-#### `modInv(mod)`
-
-Finds the [multiplicative inverse](https://en.wikipedia.org/wiki/Modular_multiplicative_inverse) of the number modulo `mod`.
-
- - `bigInt(3).modInv(11)` => `4`
- - `bigInt(42).modInv(2017)` => `1969`
-
 #### `modPow(exp, mod)`

 Takes the number to the power `exp` modulo `mod`.
@@ -421,13 +414,6 @@ Performs the bitwise XOR operation. The operands are treated as if they were rep
 
 ### Static Methods

-#### `fromArray(digits, base = 10, isNegative?)`
-
-Constructs a bigInt from an array of digits in base `base`. The optional `isNegative` flag will make the number negative.
-
- - `bigInt.fromArray([1, 2, 3, 4, 5], 10)` => `12345`
- - `bigInt.fromArray([1, 0, 0], 2, true)` => `-4`
-
 #### `gcd(a, b)`

 Finds the greatest common denominator of `a` and `b`.
--- a/node_modules/big-integer/bower.json
+++ b/node_modules/big-integer/bower.json
@@ -1,30 +0,0 @@
-{
-  "name": "big-integer",
-  "description": "An arbitrary length integer library for Javascript",
-  "main": "./BigInteger.js",
-  "authors": [
-    "Peter Olson"
-  ],
-  "license": "Unlicense",
-  "keywords": [
-    "math",
-    "big",
-    "bignum",
-    "bigint",
-    "biginteger",
-    "integer",
-    "arbitrary",
-    "precision",
-    "arithmetic"
-  ],
-  "homepage": "https://github.com/peterolson/BigInteger.js",
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "coverage",
-    "spec",
-    "tests"
-  ]
-}
--- a/node_modules/big-integer/package.json
+++ b/node_modules/big-integer/package.json
@@ -10,23 +10,24 @@
        "spec": ">=1.6.7 <2.0.0",
        "type": "range"
      },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser"
+      "d:\\cordova\\cordova-android\\node_modules\\bplist-parser"
    ]
  ],
  "_from": "big-integer@>=1.6.7 <2.0.0",
-  "_id": "big-integer@1.6.22",
+  "_id": "big-integer@1.6.15",
  "_inCache": true,
+  "_installable": true,
  "_location": "/big-integer",
-  "_nodeVersion": "6.9.4",
+  "_nodeVersion": "0.12.3",
  "_npmOperationalInternal": {
    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/big-integer-1.6.22.tgz_1493091323169_0.5048394540790468"
+    "tmp": "tmp/big-integer-1.6.15.tgz_1460079231162_0.7087579960934818"
  },
  "_npmUser": {
    "name": "peterolson",
    "email": "peter.e.c.olson+npm@gmail.com"
  },
-  "_npmVersion": "3.10.10",
+  "_npmVersion": "2.9.1",
  "_phantomChildren": {},
  "_requested": {
    "raw": "big-integer@^1.6.7",
@@ -40,11 +41,11 @@
  "_requiredBy": [
    "/bplist-parser"
  ],
-  "_resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.22.tgz",
-  "_shasum": "487c95fce886022ea48ff5f19e388932df46dd2e",
+  "_resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz",
+  "_shasum": "33d27d3b7388dfcc4b86d3130c10740cec01fb9e",
  "_shrinkwrap": null,
  "_spec": "big-integer@^1.6.7",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\bplist-parser",
  "author": {
    "name": "Peter Olson",
    "email": "peter.e.c.olson+npm@gmail.com"
@@ -63,18 +64,17 @@
    "karma": "^0.13.3",
    "karma-coverage": "^0.4.2",
    "karma-jasmine": "^0.3.6",
-    "karma-phantomjs-launcher": "~0.1",
-    "uglifyjs": "^2.4.10"
+    "karma-phantomjs-launcher": "~0.1"
  },
  "directories": {},
  "dist": {
-    "shasum": "487c95fce886022ea48ff5f19e388932df46dd2e",
-    "tarball": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.22.tgz"
+    "shasum": "33d27d3b7388dfcc4b86d3130c10740cec01fb9e",
+    "tarball": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz"
  },
  "engines": {
    "node": ">=0.6"
  },
-  "gitHead": "40483b881b4380931e5af6f2f8a161b6caa71690",
+  "gitHead": "cda5bcce74c3a4eb34951201d50c1b8776a56eca",
  "homepage": "https://github.com/peterolson/BigInteger.js#readme",
  "keywords": [
    "math",
@@ -103,8 +103,7 @@
    "url": "git+ssh://git@github.com/peterolson/BigInteger.js.git"
  },
  "scripts": {
-    "minify": "uglifyjs BigInteger.js -o BigInteger.min.js",
    "test": "karma start my.conf.js"
  },
-  "version": "1.6.22"
+  "version": "1.6.15"
 }
--- a/node_modules/bplist-parser/package.json
+++ b/node_modules/bplist-parser/package.json
@@ -10,12 +10,13 @@
        "spec": ">=0.1.0 <0.2.0",
        "type": "range"
      },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
+      "d:\\cordova\\cordova-android\\node_modules\\cordova-common"
    ]
  ],
  "_from": "bplist-parser@>=0.1.0 <0.2.0",
  "_id": "bplist-parser@0.1.1",
  "_inCache": true,
+  "_installable": true,
  "_location": "/bplist-parser",
  "_nodeVersion": "5.1.0",
  "_npmUser": {
@@ -36,11 +37,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": "d:\\cordova\\cordova-android\\node_modules\\cordova-common",
  "author": {
    "name": "Joe Ferner",
    "email": "joe.ferner@nearinfinity.com"
--- a/node_modules/brace-expansion/README.md
+++ b/node_modules/brace-expansion/README.md
@@ -5,7 +5,6 @@ as known from sh/bash, in JavaScript.

 [![build status](https://secure.travis-ci.org/juliangruber/brace-expansion.svg)](http://travis-ci.org/juliangruber/brace-expansion)
 [![downloads](https://img.shields.io/npm/dm/brace-expansion.svg)](https://www.npmjs.org/package/brace-expansion)
-[![Greenkeeper badge](https://badges.greenkeeper.io/juliangruber/brace-expansion.svg)](https://greenkeeper.io/)

 [![testling badge](https://ci.testling.com/juliangruber/brace-expansion.png)](https://ci.testling.com/juliangruber/brace-expansion)

--- a/node_modules/brace-expansion/index.js
+++ b/node_modules/brace-expansion/index.js
@@ -66,16 +66,6 @@ function expandTop(str) {
  if (!str)
    return [];

-  // I don't know why Bash 4.3 does this, but it does.
-  // Anything starting with {} will have the first two bytes preserved
-  // but *only* at the top level, so {},a}b will not expand to anything,
-  // but a{},b}c will be expanded to [a}c,abc].
-  // One could argue that this is a bug in Bash, but since the goal of
-  // this module is to match Bash's rules, we escape a leading {}
-  if (str.substr(0, 2) === '{}') {
-    str = '\\{\\}' + str.substr(2);
-  }
-
  return expand(escapeBraces(str), true).map(unescapeBraces);
 }

@@ -106,7 +96,7 @@ function expand(str, isTop) {
  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
  var isSequence = isNumericSequence || isAlphaSequence;
-  var isOptions = m.body.indexOf(',') >= 0;
+  var isOptions = /^(.*,)+(.+)?$/.test(m.body);
  if (!isSequence && !isOptions) {
    // {a},b}
    if (m.post.match(/,.*\}/)) {
--- a/node_modules/brace-expansion/package.json
+++ b/node_modules/brace-expansion/package.json
@@ -10,23 +10,24 @@
        "spec": ">=1.0.0 <2.0.0",
        "type": "range"
      },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch"
+      "d:\\cordova\\cordova-android\\node_modules\\minimatch"
    ]
  ],
  "_from": "brace-expansion@>=1.0.0 <2.0.0",
-  "_id": "brace-expansion@1.1.7",
+  "_id": "brace-expansion@1.1.5",
  "_inCache": true,
+  "_installable": true,
  "_location": "/brace-expansion",
-  "_nodeVersion": "7.8.0",
+  "_nodeVersion": "4.4.5",
  "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/brace-expansion-1.1.7.tgz_1491552830231_0.7213963181711733"
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/brace-expansion-1.1.5.tgz_1465989660138_0.34528115345165133"
  },
  "_npmUser": {
    "name": "juliangruber",
    "email": "julian@juliangruber.com"
  },
-  "_npmVersion": "4.2.0",
+  "_npmVersion": "2.15.5",
  "_phantomChildren": {},
  "_requested": {
    "raw": "brace-expansion@^1.0.0",
@@ -40,11 +41,11 @@
  "_requiredBy": [
    "/minimatch"
  ],
-  "_resolved": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-  "_shasum": "3effc3c50e000531fb720eaff80f0ae8ef23cf59",
+  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz",
+  "_shasum": "f5b4ad574e2cb7ccc1eb83e6fe79b8ecadf7a526",
  "_shrinkwrap": null,
  "_spec": "brace-expansion@^1.0.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch",
+  "_where": "d:\\cordova\\cordova-android\\node_modules\\minimatch",
  "author": {
    "name": "Julian Gruber",
    "email": "mail@juliangruber.com",
@@ -59,15 +60,14 @@
  },
  "description": "Brace expansion as known from sh/bash",
  "devDependencies": {
-    "matcha": "^0.7.0",
-    "tape": "^4.6.0"
+    "tape": "4.5.1"
  },
  "directories": {},
  "dist": {
-    "shasum": "3effc3c50e000531fb720eaff80f0ae8ef23cf59",
-    "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
+    "shasum": "f5b4ad574e2cb7ccc1eb83e6fe79b8ecadf7a526",
+    "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz"
  },
-  "gitHead": "892512024872ca7680554be90f6e8ce065053372",
+  "gitHead": "ff31acab078f1bb696ac4c55ca56ea24e6495fb6",
  "homepage": "https://github.com/juliangruber/brace-expansion",
  "keywords": [],
  "license": "MIT",
@@ -90,7 +90,6 @@
    "url": "git://github.com/juliangruber/brace-expansion.git"
  },
  "scripts": {
-    "bench": "matcha test/perf/bench.js",
    "gentest": "bash test/generate.sh",
    "test": "tape test/*.js"
  },
@@ -110,5 +109,5 @@
      "android-browser/4.2..latest"
    ]
  },
-  "version": "1.1.7"
+  "version": "1.1.5"
 }
--- a/node_modules/concat-map/package.json
+++ b/node_modules/concat-map/package.json
@@ -10,12 +10,13 @@
        "spec": "0.0.1",
        "type": "version"
      },
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion"
+      "d:\\cordova\\cordova-android\\node_modules\\brace-expansion"
    ]
  ],
  "_from": "concat-map@0.0.1",
  "_id": "concat-map@0.0.1",
  "_inCache": true,
+  "_installable": true,
  "_location": "/concat-map",
  "_npmUser": {
    "name": "substack",
@@ -35,11 +36,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": "d:\\cordova\\cordova-android\\node_modules\\brace-expansion",
  "author": {
    "name": "James Halliday",
    "email": "mail@substack.net",
--- a/node_modules/cordova-common/.ratignore
+++ b/node_modules/cordova-common/.ratignore
@@ -1,3 +1,2 @@
 fixtures
 coverage
-jasmine.json
--- a/node_modules/cordova-common/README.md
+++ b/node_modules/cordova-common/README.md
@@ -28,7 +28,7 @@ Expoeses shared functionality used by [cordova-lib](https://github.com/apache/co
 Represents special instance of NodeJS EventEmitter which is intended to be used to post events to cordova-lib and cordova-cli

 Usage:
-```js
+```
 var events = require('cordova-common').events;
 events.emit('warn', 'Some warning message')
 ```
@@ -41,7 +41,7 @@ An error class used by Cordova to throw cordova-specific errors. The CordovaErro

 Usage:

-```js
+```
 var CordovaError = require('cordova-common').CordovaError;
 throw new CordovaError('Some error message', SOME_ERR_CODE);
 ```
@@ -53,7 +53,7 @@ See [CordovaError](src/CordovaError/CordovaError.js) for supported error codes.
 Exposes functionality to deal with cordova project `config.xml` files. For ConfigParser API reference check [ConfigParser Readme](src/ConfigParser/README.md).

 Usage:
-```js
+```
 var ConfigParser = require('cordova-common').ConfigParser;
 var appConfig = new ConfigParser('path/to/cordova-app/config.xml');
 console.log(appconfig.name() + ':' + appConfig.version());
@@ -64,7 +64,7 @@ console.log(appconfig.name() + ':' + appConfig.version());
 `PluginInfo` is a wrapper for cordova plugins' `plugin.xml` files. This class may be instantiated directly or via `PluginInfoProvider`. The difference is that `PluginInfoProvider` caches `PluginInfo` instances based on plugin source directory.

 Usage:
-```js
+```
 var PluginInfo: require('cordova-common').PluginInfo;
 var PluginInfoProvider: require('cordova-common').PluginInfoProvider;

@@ -80,7 +80,7 @@ console.log('The plugin ' + plugin1.id + ' has version ' + plugin1.version)
 Utility module for dealing with sequential tasks. Provides a set of tasks that are needed to be done and reverts all tasks that are already completed if one of those tasks fail to complete. Used internally by cordova-lib and platform's plugin installation routines.

 Usage:
-```js
+```
 var ActionStack = require('cordova-common').ActionStack;
 var stack = new ActionStack()

@@ -104,7 +104,7 @@ stack.process()
 Module for spawning child processes with some advanced logic.

 Usage:
-```js
+```
 var superspawn = require('cordova-common').superspawn;
 superspawn.spawn('adb', ['devices'])
 .progress(function(data){
@@ -121,7 +121,7 @@ superspawn.spawn('adb', ['devices'])
 A set of utility methods for dealing with xml files.

 Usage:
-```js
+```
 var xml = require('cordova-common').xmlHelpers;

 var xmlDoc1 = xml.parseElementtreeSync('some/xml/file');
--- a/node_modules/cordova-common/RELEASENOTES.md
+++ b/node_modules/cordova-common/RELEASENOTES.md
@@ -20,46 +20,6 @@
 -->
 # Cordova-common Release Notes

-### 2.0.2 (Apr 14, 2017)
-* [CB-11233](https://issues.apache.org/jira/browse/CB-11233) - Support installing frameworks into 'Embedded Binaries' section of the Xcode project
-* [CB-10438](https://issues.apache.org/jira/browse/CB-10438) - Install correct dependency version. Removed shell.remove, added pkg.json to dependency tests 1-3, and updated install.js (.replace) to fix tests in uninstall.spec.js and update to workw with jasmine 2.0
-* [CB-11120](https://issues.apache.org/jira/browse/CB-11120) - Allow short/display name in config.xml
-* [CB-11346](https://issues.apache.org/jira/browse/CB-11346) - Remove known platforms check
-* [CB-11977](https://issues.apache.org/jira/browse/CB-11977) - updated engines and enginescript for common, fetch, and serve
-
-### 2.0.1 (Mar 09, 2017)
-* [CB-12557](https://issues.apache.org/jira/browse/CB-12557) add both stdout and stderr properties to the error object passed to superspawn reject handler.
-
-### 2.0.0 (Jan 17, 2017)
-* [CB-8978](https://issues.apache.org/jira/browse/CB-8978) Add `resource-file` parsing to `config.xml`
-* [CB-12018](https://issues.apache.org/jira/browse/CB-12018): updated `jshint` and updated tests to work with `jasmine@2` instead of `jasmine-node`
-* [CB-12163](https://issues.apache.org/jira/browse/CB-12163) Add reference attrib to `resource-file` for **Windows**
-* Move windows-specific logic to `cordova-windows`
-* [CB-12189](https://issues.apache.org/jira/browse/CB-12189) Add implementation attribute to framework
-
-### 1.5.1 (Oct 12, 2016)
-* [CB-12002](https://issues.apache.org/jira/browse/CB-12002) Add `getAllowIntents()` to `ConfigParser`
-* [CB-11998](https://issues.apache.org/jira/browse/CB-11998) `cordova platform add` error with `cordova-common@1.5.0`
-
-### 1.5.0 (Oct 06, 2016)
-* [CB-11776](https://issues.apache.org/jira/browse/CB-11776) Add test case for different `edit-config` targets
-* [CB-11908](https://issues.apache.org/jira/browse/CB-11908) Add `edit-config` to `config.xml`
-* [CB-11936](https://issues.apache.org/jira/browse/CB-11936) Support four new **App Transport Security (ATS)** keys
-* update `config.xml` location if it is a **Android Studio** project.
-* use `array` methods and `object.keys` for iterating. avoiding `for-in` loops
-* [CB-11517](https://issues.apache.org/jira/browse/CB-11517) Allow `.folder` matches
-* [CB-11776](https://issues.apache.org/jira/browse/CB-11776) check `edit-config` target exists
-
-### 1.4.1 (Aug 09, 2016)
-* Add general purpose `ConfigParser.getAttribute` API
-* [CB-11653](https://issues.apache.org/jira/browse/CB-11653) moved `findProjectRoot` from `cordova-lib` to `cordova-common`
-* [CB-11636](https://issues.apache.org/jira/browse/CB-11636) Handle attributes with quotes correctly
-* [CB-11645](https://issues.apache.org/jira/browse/CB-11645) added check to see if `getEditConfig` exists before trying to use it
-* [CB-9825](https://issues.apache.org/jira/browse/CB-9825) framework tag spec parsing
-
-### 1.4.0 (Jul 12, 2016)
-* [CB-11023](https://issues.apache.org/jira/browse/CB-11023) Add edit-config functionality
-
 ### 1.3.0 (May 12, 2016)
 * [CB-11259](https://issues.apache.org/jira/browse/CB-11259): Improving prepare and build logging
 * [CB-11194](https://issues.apache.org/jira/browse/CB-11194) Improve cordova load time
--- a/node_modules/cordova-common/cordova-common.js
+++ b/node_modules/cordova-common/cordova-common.js
@@ -27,7 +27,6 @@ addProperty(module, 'superspawn', './src/superspawn');
 addProperty(module, 'ActionStack', './src/ActionStack');
 addProperty(module, 'CordovaError', './src/CordovaError/CordovaError');
 addProperty(module, 'CordovaLogger', './src/CordovaLogger');
-addProperty(module, 'CordovaCheck', './src/CordovaCheck');
 addProperty(module, 'CordovaExternalToolErrorContext', './src/CordovaError/CordovaExternalToolErrorContext');
 addProperty(module, 'PlatformJson', './src/PlatformJson');
 addProperty(module, 'ConfigParser', './src/ConfigParser/ConfigParser');
--- a/node_modules/cordova-common/package.json
+++ b/node_modules/cordova-common/package.json
@@ -2,49 +2,50 @@
  "_args": [
    [
      {
-        "raw": "cordova-common@^2.0.1",
+        "raw": "cordova-common@^1.3.0",
        "scope": null,
        "escapedName": "cordova-common",
        "name": "cordova-common",
-        "rawSpec": "^2.0.1",
-        "spec": ">=2.0.1 <3.0.0",
+        "rawSpec": "^1.3.0",
+        "spec": ">=1.3.0 <2.0.0",
        "type": "range"
      },
-      "/Users/steveng/repo/cordova/cordova-android"
+      "d:\\cordova\\cordova-android"
    ]
  ],
-  "_from": "cordova-common@>=2.0.1 <3.0.0",
-  "_id": "cordova-common@2.0.2",
+  "_from": "cordova-common@>=1.3.0 <2.0.0",
+  "_id": "cordova-common@1.3.0",
  "_inCache": true,
+  "_installable": true,
  "_location": "/cordova-common",
-  "_nodeVersion": "4.7.3",
+  "_nodeVersion": "5.4.1",
  "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/cordova-common-2.0.2.tgz_1492453798445_0.6290795875247568"
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/cordova-common-1.3.0.tgz_1464130094288_0.48495062021538615"
  },
  "_npmUser": {
-    "name": "shazron",
-    "email": "shazron@gmail.com"
+    "name": "stevegill",
+    "email": "stevengill97@gmail.com"
  },
-  "_npmVersion": "2.15.11",
+  "_npmVersion": "3.9.0",
  "_phantomChildren": {},
  "_requested": {
-    "raw": "cordova-common@^2.0.1",
+    "raw": "cordova-common@^1.3.0",
    "scope": null,
    "escapedName": "cordova-common",
    "name": "cordova-common",
-    "rawSpec": "^2.0.1",
-    "spec": ">=2.0.1 <3.0.0",
+    "rawSpec": "^1.3.0",
+    "spec": ">=1.3.0 <2.0.0",
    "type": "range"
  },
  "_requiredBy": [
    "/"
  ],
-  "_resolved": "http://registry.npmjs.org/cordova-common/-/cordova-common-2.0.2.tgz",
-  "_shasum": "57467976b8afd5e0bd0a13111b66a420441601cb",
+  "_resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-1.3.0.tgz",
+  "_shasum": "f75161f6aa7cef5486fd5d69a3b0a1f628334491",
  "_shrinkwrap": null,
-  "_spec": "cordova-common@^2.0.1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android",
+  "_spec": "cordova-common@^1.3.0",
+  "_where": "d:\\cordova\\cordova-android",
  "author": {
    "name": "Apache Software Foundation"
  },
@@ -70,20 +71,20 @@
  },
  "description": "Apache Cordova tools and platforms shared routines",
  "devDependencies": {
-    "istanbul": "^0.4.5",
-    "jasmine": "^2.5.2",
+    "istanbul": "^0.3.17",
+    "jasmine-node": "^1.14.5",
    "jshint": "^2.8.0",
    "promise-matchers": "^0.9.6",
    "rewire": "^2.5.1"
  },
  "directories": {},
  "dist": {
-    "shasum": "57467976b8afd5e0bd0a13111b66a420441601cb",
-    "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.2.tgz"
+    "shasum": "f75161f6aa7cef5486fd5d69a3b0a1f628334491",
+    "tarball": "https://registry.npmjs.org/cordova-common/-/cordova-common-1.3.0.tgz"
  },
  "engineStrict": true,
  "engines": {
-    "node": ">=4.0.0"
+    "node": ">=0.9.9"
  },
  "license": "Apache-2.0",
  "main": "cordova-common.js",
@@ -92,10 +93,6 @@
      "name": "bowserj",
      "email": "bowserj@apache.org"
    },
-    {
-      "name": "filmaj",
-      "email": "maj.fil@gmail.com"
-    },
    {
      "name": "kotikov.vladimir",
      "email": "kotikov.vladimir@gmail.com"
@@ -125,10 +122,10 @@
    "url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git"
  },
  "scripts": {
-    "cover": "istanbul cover --root src --print detail jasmine",
-    "jasmine": "jasmine --captureExceptions --color",
-    "jshint": "jshint src && jshint spec",
+    "cover": "node node_modules/istanbul/lib/cli.js cover --root src --print detail node_modules/jasmine-node/bin/jasmine-node -- spec",
+    "jasmine": "node node_modules/jasmine-node/bin/jasmine-node --captureExceptions --color spec",
+    "jshint": "node node_modules/jshint/bin/jshint src && node node_modules/jshint/bin/jshint spec",
    "test": "npm run jshint && npm run jasmine"
  },
-  "version": "2.0.2"
+  "version": "1.3.0"
 }
--- a/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js
+++ b/node_modules/cordova-common/src/ConfigChanges/ConfigChanges.js
@@ -1,21 +1,21 @@
-/**
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    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
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-*/ 
+/*
+ *
+ * Copyright 2013 Anis Kadri
+ *
+ * Licensed 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/

 /*
 * This module deals with shared configuration / dependency "stuff". That is:
@@ -31,13 +31,14 @@

 /* jshint sub:true */

-var path = require('path'),
+var fs   = require('fs'),
+    path = require('path'),
    et   = require('elementtree'),
-    ConfigKeeper = require('./ConfigKeeper'),
-    CordovaLogger = require('../CordovaLogger');
+    semver = require('semver'),
+    events = require('../events'),
+    ConfigKeeper = require('./ConfigKeeper');

 var mungeutil = require('./munge-util');
-var xml_helpers = require('../util/xml-helpers');

 exports.PlatformMunger = PlatformMunger;

@@ -94,18 +95,26 @@ function remove_plugin_changes(pluginInfo, is_top_level) {
    var plugin_vars = is_top_level ?
        platform_config.installed_plugins[pluginInfo.id] :
        platform_config.dependent_plugins[pluginInfo.id];
-    var edit_config_changes = null;
-    if(pluginInfo.getEditConfigs) {
-        edit_config_changes = pluginInfo.getEditConfigs(self.platform);
-    }

    // get config munge, aka how did this plugin change various config files
-    var config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars, edit_config_changes);
+    var config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars);
    // global munge looks at all plugins' changes to config files
    var global_munge = platform_config.config_munge;
    var munge = mungeutil.decrement_munge(global_munge, config_munge);

    for (var file in munge.files) {
+        // CB-6976 Windows Universal Apps. Compatibility fix for existing plugins.
+        if (self.platform == 'windows' && file == 'package.appxmanifest' &&
+            !fs.existsSync(path.join(self.project_dir, 'package.appxmanifest'))) {
+            // New windows template separate manifest files for Windows10, Windows8.1 and WP8.1
+            var substs = ['package.phone.appxmanifest', 'package.windows.appxmanifest', 'package.windows10.appxmanifest'];
+            /* jshint loopfunc:true */
+            substs.forEach(function(subst) {
+                events.emit('verbose', 'Applying munge to ' + subst);
+                self.apply_file_munge(subst, munge.files[file], true);
+            });
+            /* jshint loopfunc:false */
+        }
        self.apply_file_munge(file, munge.files[file], /* remove = */ true);
    }

@@ -116,111 +125,13 @@ function remove_plugin_changes(pluginInfo, is_top_level) {


 PlatformMunger.prototype.add_plugin_changes = add_plugin_changes;
-function add_plugin_changes(pluginInfo, plugin_vars, is_top_level, should_increment, plugin_force) {
+function add_plugin_changes(pluginInfo, plugin_vars, is_top_level, should_increment) {
    var self = this;
    var platform_config = self.platformJson.root;

-    var edit_config_changes = null;
-    if(pluginInfo.getEditConfigs) {
-        edit_config_changes = pluginInfo.getEditConfigs(self.platform);
-    }
-
-    var config_munge;
-
-    if (!edit_config_changes || edit_config_changes.length === 0) {
-        // get config munge, aka how should this plugin change various config files
-        config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars);
-    }
-    else {
-        var isConflictingInfo = is_conflicting(edit_config_changes, platform_config.config_munge, self, plugin_force);
-
-        if (isConflictingInfo.conflictWithConfigxml) {
-            throw new Error(pluginInfo.id +
-                ' cannot be added. <edit-config> changes in this plugin conflicts with <edit-config> changes in config.xml. Conflicts must be resolved before plugin can be added.');
-        }
-        if (plugin_force) {
-            CordovaLogger.get().log(CordovaLogger.WARN, '--force is used. edit-config will overwrite conflicts if any. Conflicting plugins may not work as expected.');
-
-            // remove conflicting munges
-            var conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.conflictingMunge);
-            for (var conflict_file in conflict_munge.files) {
-                self.apply_file_munge(conflict_file, conflict_munge.files[conflict_file], /* remove = */ true);
-            }
-
-            // force add new munges
-            config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars, edit_config_changes);
-        }
-        else if(isConflictingInfo.conflictFound) {
-            throw new Error('There was a conflict trying to modify attributes with <edit-config> in plugin ' + pluginInfo.id +
-            '. The conflicting plugin, ' + isConflictingInfo.conflictingPlugin + ', already modified the same attributes. The conflict must be resolved before ' +
-            pluginInfo.id + ' can be added. You may use --force to add the plugin and overwrite the conflicting attributes.');
-        }
-        else {
-            // no conflicts, will handle edit-config
-            config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars, edit_config_changes);
-        }
-    }
-
-    self = munge_helper(should_increment, self, platform_config, config_munge);
-
-    // Move to installed/dependent_plugins
-    self.platformJson.addPlugin(pluginInfo.id, plugin_vars || {}, is_top_level);
-    return self;
-}
-
-
-// Handle edit-config changes from config.xml
-PlatformMunger.prototype.add_config_changes = add_config_changes;
-function add_config_changes(config, should_increment) {
-    var self = this;
-    var platform_config = self.platformJson.root;
-
-    var config_munge;
-    var edit_config_changes = null;
-    if(config.getEditConfigs) {
-        edit_config_changes = config.getEditConfigs(self.platform);
-    }
-
-    if (!edit_config_changes || edit_config_changes.length === 0) {
-        // There are no edit-config changes to add, return here
-        return self;
-    }
-    else {
-        var isConflictingInfo = is_conflicting(edit_config_changes, platform_config.config_munge, self, true /*always force overwrite other edit-config*/);
-
-        if(isConflictingInfo.conflictFound) {
-            var conflict_munge;
-            var conflict_file;
-
-            if (Object.keys(isConflictingInfo.configxmlMunge.files).length !== 0) {
-                // silently remove conflicting config.xml munges so new munges can be added
-                conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.configxmlMunge);
-                for (conflict_file in conflict_munge.files) {
-                    self.apply_file_munge(conflict_file, conflict_munge.files[conflict_file], /* remove = */ true);
-                }
-            }
-            if (Object.keys(isConflictingInfo.conflictingMunge.files).length !== 0) {
-                CordovaLogger.get().log(CordovaLogger.WARN, 'Conflict found, edit-config changes from config.xml will overwrite plugin.xml changes');
-
-                // remove conflicting plugin.xml munges
-                conflict_munge = mungeutil.decrement_munge(platform_config.config_munge, isConflictingInfo.conflictingMunge);
-                for (conflict_file in conflict_munge.files) {
-                    self.apply_file_munge(conflict_file, conflict_munge.files[conflict_file], /* remove = */ true);
-                }
-            }
-        }
-        // Add config.xml edit-config munges
-        config_munge = self.generate_config_xml_munge(config, edit_config_changes, 'config.xml');
-    }
-
-    self = munge_helper(should_increment, self, platform_config, config_munge);
-
-    // Move to installed/dependent_plugins
-    return self;
-}
-
-function munge_helper(should_increment, self, platform_config, config_munge) {
-    // global munge looks at all changes to config files
+    // get config munge, aka how should this plugin change various config files
+    var config_munge = self.generate_plugin_config_munge(pluginInfo, plugin_vars);
+    // global munge looks at all plugins' changes to config files

    // TODO: The should_increment param is only used by cordova-cli and is going away soon.
    // If should_increment is set to false, avoid modifying the global_munge (use clone)
@@ -235,9 +146,22 @@ function munge_helper(should_increment, self, platform_config, config_munge) {
    }

    for (var file in munge.files) {
+        // CB-6976 Windows Universal Apps. Compatibility fix for existing plugins.
+        if (self.platform == 'windows' && file == 'package.appxmanifest' &&
+            !fs.existsSync(path.join(self.project_dir, 'package.appxmanifest'))) {
+            var substs = ['package.phone.appxmanifest', 'package.windows.appxmanifest', 'package.windows10.appxmanifest'];
+            /* jshint loopfunc:true */
+            substs.forEach(function(subst) {
+                events.emit('verbose', 'Applying munge to ' + subst);
+                self.apply_file_munge(subst, munge.files[file]);
+            });
+            /* jshint loopfunc:false */
+        }
        self.apply_file_munge(file, munge.files[file]);
    }

+    // Move to installed/dependent_plugins
+    self.platformJson.addPlugin(pluginInfo.id, plugin_vars || {}, is_top_level);
    return self;
 }

@@ -258,52 +182,101 @@ function reapply_global_munge () {
    return self;
 }

-// generate_plugin_config_munge
-// Generate the munge object from config.xml
-PlatformMunger.prototype.generate_config_xml_munge = generate_config_xml_munge;
-function generate_config_xml_munge(config, edit_config_changes, type) {
-
-    var munge = { files: {} };
-    var changes = edit_config_changes;
-    var id;
-
-    if(!changes) {
-        return munge;
-    }
-
-    if (type === 'config.xml') {
-        id = type;
-    }
-    else {
-        id = config.id;
-    }
-
-    changes.forEach(function(change) {
-        change.xmls.forEach(function(xml) {
-            // 1. stringify each xml
-            var stringified = (new et.ElementTree(xml)).write({xml_declaration:false});
-            // 2. add into munge
-            if (change.mode) {
-                mungeutil.deep_add(munge, change.file, change.target, { xml: stringified, count: 1, mode: change.mode, id: id });
-            }
-        });
-    });
-    return munge;
-}
-

 // generate_plugin_config_munge
 // Generate the munge object from plugin.xml + vars
 PlatformMunger.prototype.generate_plugin_config_munge = generate_plugin_config_munge;
-function generate_plugin_config_munge(pluginInfo, vars, edit_config_changes) {
+function generate_plugin_config_munge(pluginInfo, vars) {
    var self = this;

    vars = vars || {};
    var munge = { files: {} };
    var changes = pluginInfo.getConfigFiles(self.platform);

-    if(edit_config_changes) {
-        Array.prototype.push.apply(changes, edit_config_changes);
+    // Demux 'package.appxmanifest' into relevant platform-specific appx manifests.
+    // Only spend the cycles if there are version-specific plugin settings
+    if (self.platform === 'windows' &&
+            changes.some(function(change) {
+                return ((typeof change.versions !== 'undefined') ||
+                    (typeof change.deviceTarget !== 'undefined'));
+            }))
+    {
+        var manifests = {
+            'windows': {
+                '8.1.0': 'package.windows.appxmanifest',
+                '10.0.0': 'package.windows10.appxmanifest'
+            },
+            'phone': {
+                '8.1.0': 'package.phone.appxmanifest',
+                '10.0.0': 'package.windows10.appxmanifest'
+            },
+            'all': {
+                '8.1.0': ['package.windows.appxmanifest', 'package.phone.appxmanifest'],
+                '10.0.0': 'package.windows10.appxmanifest'
+            }
+        };
+
+        var oldChanges = changes;
+        changes = [];
+
+        oldChanges.forEach(function(change, changeIndex) {
+            // Only support semver/device-target demux for package.appxmanifest
+            // Pass through in case something downstream wants to use it
+            if (change.target !== 'package.appxmanifest') {
+                changes.push(change);
+                return;
+            }
+
+            var hasVersion = (typeof change.versions !== 'undefined');
+            var hasTargets = (typeof change.deviceTarget !== 'undefined');
+
+            // No semver/device-target for this config-file, pass it through
+            if (!(hasVersion || hasTargets)) {
+                changes.push(change);
+                return;
+            }
+
+            var targetDeviceSet = hasTargets ? change.deviceTarget : 'all';
+            if (['windows', 'phone', 'all'].indexOf(targetDeviceSet) === -1) {
+                // target-device couldn't be resolved, fix it up here to a valid value
+                targetDeviceSet = 'all';
+            }
+            var knownWindowsVersionsForTargetDeviceSet = Object.keys(manifests[targetDeviceSet]);
+
+            // at this point, 'change' targets package.appxmanifest and has a version attribute
+            knownWindowsVersionsForTargetDeviceSet.forEach(function(winver) {
+                // This is a local function that creates the new replacement representing the
+                // mutation.  Used to save code further down.
+                var createReplacement = function(manifestFile, originalChange) {
+                    var replacement = {
+                        target:         manifestFile,
+                        parent:         originalChange.parent,
+                        after:          originalChange.after,
+                        xmls:           originalChange.xmls,
+                        versions:       originalChange.versions,
+                        deviceTarget:   originalChange.deviceTarget
+                    };
+                    return replacement;
+                };
+
+                // version doesn't satisfy, so skip
+                if (hasVersion && !semver.satisfies(winver, change.versions)) {
+                    return;
+                }
+
+                var versionSpecificManifests = manifests[targetDeviceSet][winver];
+                if (versionSpecificManifests.constructor === Array) {
+                    // e.g. all['8.1.0'] === ['pkg.windows.appxmanifest', 'pkg.phone.appxmanifest']
+                    versionSpecificManifests.forEach(function(manifestFile) {
+                        changes.push(createReplacement(manifestFile, change));
+                    });
+                }
+                else {
+                    // versionSpecificManifests is actually a single string
+                    changes.push(createReplacement(versionSpecificManifests, change));
+                }
+            });
+        });
    }

    changes.forEach(function(change) {
@@ -318,93 +291,12 @@ function generate_plugin_config_munge(pluginInfo, vars, edit_config_changes) {
                });
            }
            // 2. add into munge
-            if (change.mode) {
-                if (change.mode !== 'remove') {
-                    mungeutil.deep_add(munge, change.file, change.target, { xml: stringified, count: 1, mode: change.mode, plugin: pluginInfo.id });
-                }
-            }
-            else {
-                mungeutil.deep_add(munge, change.target, change.parent, { xml: stringified, count: 1, after: change.after });
-            }
+            mungeutil.deep_add(munge, change.target, change.parent, { xml: stringified, count: 1, after: change.after });
        });
    });
    return munge;
 }

-function is_conflicting(editchanges, config_munge, self, force) {
-    var files = config_munge.files;
-    var conflictFound = false;
-    var conflictWithConfigxml = false;
-    var conflictingMunge = { files: {} };
-    var configxmlMunge = { files: {} };
-    var conflictingParent;
-    var conflictingPlugin;
-
-    editchanges.forEach(function(editchange) {
-        if (files[editchange.file]) {
-            var parents = files[editchange.file].parents;
-            var target = parents[editchange.target];
-
-            // Check if the edit target will resolve to an existing target
-            if (!target || target.length === 0) {
-                var file_xml = self.config_keeper.get(self.project_dir, self.platform, editchange.file).data;
-                var resolveEditTarget = xml_helpers.resolveParent(file_xml, editchange.target);
-                var resolveTarget;
-
-                if (resolveEditTarget) {
-                    for (var parent in parents) {
-                        resolveTarget = xml_helpers.resolveParent(file_xml, parent);
-                        if (resolveEditTarget === resolveTarget) {
-                            conflictingParent = parent;
-                            target = parents[parent];
-                            break;
-                        }
-                    }
-                }
-            }
-            else {
-                conflictingParent = editchange.target;
-            }
-
-            if (target && target.length !== 0) {
-                // conflict has been found
-                conflictFound = true;
-
-                if (editchange.id === 'config.xml') {
-                    if (target[0].id === 'config.xml') {
-                        // Keep track of config.xml/config.xml edit-config conflicts
-                        mungeutil.deep_add(configxmlMunge, editchange.file, conflictingParent, target[0]);
-                    }
-                    else {
-                        // Keep track of config.xml x plugin.xml edit-config conflicts
-                        mungeutil.deep_add(conflictingMunge, editchange.file, conflictingParent, target[0]);
-                    }
-                }
-                else {
-                    if (target[0].id === 'config.xml') {
-                        // plugin.xml cannot overwrite config.xml changes even if --force is used
-                        conflictWithConfigxml = true;
-                        return;
-                    }
-
-                    if (force) {
-                        // Need to find all conflicts when --force is used, track conflicting munges
-                        mungeutil.deep_add(conflictingMunge, editchange.file, conflictingParent, target[0]);
-                    }
-                    else {
-                        // plugin cannot overwrite other plugin changes without --force
-                        conflictingPlugin = target[0].plugin;
-                        return;
-                    }
-                }
-            }
-        }
-    });
-
-    return {conflictFound: conflictFound, conflictingPlugin: conflictingPlugin, conflictingMunge: conflictingMunge,
-        configxmlMunge: configxmlMunge, conflictWithConfigxml:conflictWithConfigxml};
-}
-
 // Go over the prepare queue and apply the config munges for each plugin
 // that has been (un)installed.
 PlatformMunger.prototype.process = PlatformMunger_process;
@@ -421,7 +313,7 @@ function PlatformMunger_process(plugins_dir) {
    // Now handle installation
    platform_config.prepare_queue.installed.forEach(function(u) {
        var pluginInfo = self.pluginInfoProvider.get(path.join(plugins_dir, u.plugin));
-        self.add_plugin_changes(pluginInfo, u.vars, u.topLevel, true, u.force);
+        self.add_plugin_changes(pluginInfo, u.vars, u.topLevel, true);
    });

    // Empty out installed/ uninstalled queues.
--- a/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js
+++ b/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js
@@ -103,19 +103,7 @@ ConfigFile.prototype.graft_child = function ConfigFile_graft_child(selector, xml
    var result;
    if (self.type === 'xml') {
        var xml_to_graft = [modules.et.XML(xml_child.xml)];
-        switch (xml_child.mode) {
-            case 'merge':
-                result = modules.xml_helpers.graftXMLMerge(self.data, xml_to_graft, selector, xml_child);
-                break;
-            case 'overwrite':
-                result = modules.xml_helpers.graftXMLOverwrite(self.data, xml_to_graft, selector, xml_child);
-                break;
-            case 'remove':
-                result= true;
-                break;
-            default:
-                result = modules.xml_helpers.graftXML(self.data, xml_to_graft, selector, xml_child.after);
-        }
+        result = modules.xml_helpers.graftXML(self.data, xml_to_graft, selector, xml_child.after);
        if ( !result) {
            throw new Error('Unable to graft xml at selector "' + selector + '" from "' + filepath + '" during config install');
        }
@@ -135,17 +123,7 @@ ConfigFile.prototype.prune_child = function ConfigFile_prune_child(selector, xml
    var result;
    if (self.type === 'xml') {
        var xml_to_graft = [modules.et.XML(xml_child.xml)];
-        switch (xml_child.mode) {
-            case 'merge':
-            case 'overwrite':
-                result = modules.xml_helpers.pruneXMLRestore(self.data, selector, xml_child);
-                break;
-            case 'remove':
-                result = modules.xml_helpers.prunXMLRemove(self.data, selector, xml_to_graft);
-                break;
-            default:
-                result = modules.xml_helpers.pruneXML(self.data, xml_to_graft, selector);
-        }
+        result = modules.xml_helpers.pruneXML(self.data, xml_to_graft, selector);
    } else {
        // plist file
        result = modules.plist_helpers.prunePLIST(self.data, xml_child.xml, selector);
@@ -199,12 +177,6 @@ function resolveConfigFilePath(project_dir, platform, file) {
        return filepath;
    }

-    // XXX this checks for android studio projects
-    // only if none of the options above are satisfied does this get called
-    if(platform === 'android' && !fs.existsSync(filepath)) {
-      filepath = path.join(project_dir, 'app', 'src', 'main', 'res', 'xml', 'config.xml');
-    }
-
    // None of the special cases matched, returning project_dir/file.
    return filepath;
 }
--- a/node_modules/cordova-common/src/ConfigChanges/munge-util.js
+++ b/node_modules/cordova-common/src/ConfigChanges/munge-util.js
@@ -52,9 +52,6 @@ exports.deep_remove = function deep_remove(obj, keys /* or key1, key2 .... */ )
            return element.xml == k.xml;
        });
        if (found) {
-            if (parentArray[index].oldAttrib) {
-                k.oldAttrib = _.extend({}, parentArray[index].oldAttrib);
-            }
            found.count -= k.count;
            if (found.count > 0) {
                return false;
--- a/node_modules/cordova-common/src/ConfigParser/ConfigParser.js
+++ b/node_modules/cordova-common/src/ConfigParser/ConfigParser.js
@@ -90,24 +90,20 @@ function findElementAttributeValue(attributeName, elems) {
 }

 ConfigParser.prototype = {
-    getAttribute: function(attr) {
-        return this.doc.getroot().attrib[attr];
-    },
-
    packageName: function(id) {
-        return this.getAttribute('id');
+        return this.doc.getroot().attrib['id'];
    },
    setPackageName: function(id) {
        this.doc.getroot().attrib['id'] = id;
    },
    android_packageName: function() {
-        return this.getAttribute('android-packageName');
+        return this.doc.getroot().attrib['android-packageName'];
    },
    android_activityName: function() {
-        return this.getAttribute('android-activityName');
+	return this.doc.getroot().attrib['android-activityName'];
    },
    ios_CFBundleIdentifier: function() {
-        return this.getAttribute('ios-CFBundleIdentifier');
+        return this.doc.getroot().attrib['ios-CFBundleIdentifier'];
    },
    name: function() {
        return getNodeTextSafe(this.doc.find('name'));
@@ -116,16 +112,6 @@ ConfigParser.prototype = {
        var el = findOrCreate(this.doc, 'name');
        el.text = name;
    },
-    shortName: function() {
-        return this.doc.find('name').attrib['short'] || this.name();
-    },
-    setShortName: function(shortname) {
-        var el = findOrCreate(this.doc, 'name');
-        if (!el.text) {
-            el.text = shortname;
-        }
-        el.attrib['short'] = shortname;
-    },
    description: function() {
        return getNodeTextSafe(this.doc.find('description'));
    },
@@ -134,16 +120,16 @@ ConfigParser.prototype = {
        el.text = text;
    },
    version: function() {
-        return this.getAttribute('version');
+        return this.doc.getroot().attrib['version'];
    },
    windows_packageVersion: function() {
-        return this.getAttribute('windows-packageVersion');
+        return this.doc.getroot().attrib('windows-packageVersion');
    },
    android_versionCode: function() {
-        return this.getAttribute('android-versionCode');
+        return this.doc.getroot().attrib['android-versionCode'];
    },
    ios_CFBundleVersion: function() {
-        return this.getAttribute('ios-CFBundleVersion');
+        return this.doc.getroot().attrib['ios-CFBundleVersion'];
    },
    setVersion: function(value) {
        this.doc.getroot().attrib['version'] = value;
@@ -266,30 +252,6 @@ ConfigParser.prototype = {
        return this.getStaticResources(platform, 'splash');
    },

-    /**
-     * Returns all resource-files for a specific platform.
-     * @param  {string} platform Platform name
-     * @return {Resource[]}      Array of resource file objects.
-     */
-    getFileResources: function(platform) {
-        var fileResources = [];
-
-        if (platform) { // platform specific resources
-            fileResources = this.doc.findall('platform[@name=\'' + platform + '\']/resource-file').map(function(tag) {
-                return {
-                    platform: platform,
-                    src: tag.attrib.src,
-                    target: tag.attrib.target,
-                    versions: tag.attrib.versions,
-                    deviceTarget: tag.attrib['device-target'],
-                    arch: tag.attrib.arch
-                };
-            });
-        }
-
-        return fileResources;
-    },
-
    /**
     * Returns all hook scripts for the hook type specified.
     * @param  {String} hook     The hook type.
@@ -482,19 +444,10 @@ ConfigParser.prototype = {
        return accesses.map(function(access){
            var minimum_tls_version = access.attrib['minimum-tls-version']; /* String */
            var requires_forward_secrecy = access.attrib['requires-forward-secrecy']; /* Boolean */
-            var requires_certificate_transparency = access.attrib['requires-certificate-transparency']; /* Boolean */
-            var allows_arbitrary_loads_in_web_content = access.attrib['allows-arbitrary-loads-in-web-content']; /* Boolean */
-            var allows_arbitrary_loads_in_media = access.attrib['allows-arbitrary-loads-in-media']; /* Boolean */
-            var allows_local_networking = access.attrib['allows-local-networking']; /* Boolean */
-            
            return {
                'origin': access.attrib.origin,
                'minimum_tls_version': minimum_tls_version,
-                'requires_forward_secrecy' : requires_forward_secrecy,
-                'requires_certificate_transparency' : requires_certificate_transparency,
-                'allows_arbitrary_loads_in_web_content' : allows_arbitrary_loads_in_web_content,
-                'allows_arbitrary_loads_in_media' : allows_arbitrary_loads_in_media,
-                'allows_local_networking' : allows_local_networking
+                'requires_forward_secrecy' : requires_forward_secrecy
            };
        });
    },
@@ -504,44 +457,13 @@ ConfigParser.prototype = {
        return allow_navigations.map(function(allow_navigation){
            var minimum_tls_version = allow_navigation.attrib['minimum-tls-version']; /* String */
            var requires_forward_secrecy = allow_navigation.attrib['requires-forward-secrecy']; /* Boolean */
-            var requires_certificate_transparency = allow_navigation.attrib['requires-certificate-transparency']; /* Boolean */
-
            return {
                'href': allow_navigation.attrib.href,
                'minimum_tls_version': minimum_tls_version,
-                'requires_forward_secrecy' : requires_forward_secrecy,
-                'requires_certificate_transparency' : requires_certificate_transparency
+                'requires_forward_secrecy' : requires_forward_secrecy
            };
        });
    },
-    /* Get all the allow-intent tags */
-    getAllowIntents: function() {
-        var allow_intents = this.doc.findall('./allow-intent');
-        return allow_intents.map(function(allow_intent){
-            return {
-                'href': allow_intent.attrib.href
-            };
-        });
-    },
-    /* Get all edit-config tags */
-    getEditConfigs: function(platform) {
-        var platform_tag = this.doc.find('./platform[@name="' + platform + '"]');
-        var platform_edit_configs = platform_tag ? platform_tag.findall('edit-config') : [];
-
-        var edit_configs = this.doc.findall('edit-config').concat(platform_edit_configs);
-
-        return edit_configs.map(function(tag) {
-            var editConfig =
-                {
-                    file : tag.attrib['file'],
-                    target : tag.attrib['target'],
-                    mode : tag.attrib['mode'],
-                    id : 'config.xml',
-                    xmls : tag.getchildren()
-                };
-            return editConfig;
-        });
-    },
    write:function() {
        fs.writeFileSync(this.path, this.doc.write({indent: 4}), 'utf-8');
    }
--- a/node_modules/cordova-common/src/CordovaCheck.js
+++ b/node_modules/cordova-common/src/CordovaCheck.js
@@ -1,76 +0,0 @@
-/**
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    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
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-*/
-
-var fs = require('fs'),
-    path = require('path');
-
-function isRootDir(dir) {
-    if (fs.existsSync(path.join(dir, 'www'))) {
-        if (fs.existsSync(path.join(dir, 'config.xml'))) {
-            // For sure is.
-            if (fs.existsSync(path.join(dir, 'platforms'))) {
-                return 2;
-            } else {
-                return 1;
-            }
-        }
-        // Might be (or may be under platforms/).
-        if (fs.existsSync(path.join(dir, 'www', 'config.xml'))) {
-            return 1;
-        }
-    }
-    return 0;
-}
-
-// Runs up the directory chain looking for a .cordova directory.
-// IF it is found we are in a Cordova project.
-// Omit argument to use CWD.
-function isCordova(dir) {
-    if (!dir) {
-        // Prefer PWD over cwd so that symlinked dirs within your PWD work correctly (CB-5687).
-        var pwd = process.env.PWD;
-        var cwd = process.cwd();
-        if (pwd && pwd != cwd && pwd != 'undefined') {
-            return isCordova(pwd) || isCordova(cwd);
-        }
-        return isCordova(cwd);
-    }
-    var bestReturnValueSoFar = false;
-    for (var i = 0; i < 1000; ++i) {
-        var result = isRootDir(dir);
-        if (result === 2) {
-            return dir;
-        }
-        if (result === 1) {
-            bestReturnValueSoFar = dir;
-        }
-        var parentDir = path.normalize(path.join(dir, '..'));
-        // Detect fs root.
-        if (parentDir == dir) {
-            return bestReturnValueSoFar;
-        }
-        dir = parentDir;
-    }
-    console.error('Hit an unhandled case in CordovaCheck.isCordova');
-    return false;
-}
-
-module.exports = {
-    findProjectRoot : isCordova
-};
--- a/node_modules/cordova-common/src/FileUpdater.js
+++ b/node_modules/cordova-common/src/FileUpdater.js
@@ -285,14 +285,14 @@ function mergeAndUpdateDir(sourceDirs, targetDir, options, log) {
    }

    // Scan the files in each of the source directories.
-    var sourceMaps = sourceDirs.map(function (sourceDir) {
-            return path.join(rootDir, sourceDir);
-        }).map(function (sourcePath) {
-            if (!fs.existsSync(sourcePath)) {
-                throw new Error("Source directory does not exist: " + sourcePath);
-            }
-            return mapDirectory(rootDir, path.relative(rootDir, sourcePath), include, exclude);
-        });
+    var sourceMaps = [];
+    for (var i in sourceDirs) {
+        var sourceFullPath = path.join(rootDir, sourceDirs[i]);
+        if (!fs.existsSync(sourceFullPath)) {
+            throw new Error("Source directory does not exist: " + sourceDirs[i]);
+        }
+        sourceMaps[i] = mapDirectory(rootDir, sourceDirs[i], include, exclude);
+    }

    // Scan the files in the target directory, if it exists.
    var targetMap = {};
@@ -331,40 +331,46 @@ function mapDirectory(rootDir, subDir, include, exclude) {
    function mapSubdirectory(rootDir, subDir, relativeDir, include, exclude, dirMap) {
        var itemMapped = false;
        var items = fs.readdirSync(path.join(rootDir, subDir, relativeDir));
+        for (var i in items) {
+            var relativePath = path.join(relativeDir, items[i]);

-        items.forEach(function(item) {
-            var relativePath = path.join(relativeDir, item);
-            if(!matchGlobArray(relativePath, exclude)) {
-                // Stats obtained here (required at least to know where to recurse in directories)
-                // are saved for later, where the modified times may also be used. This minimizes
-                // the number of file I/O operations performed.
-                var fullPath = path.join(rootDir, subDir, relativePath);
-                var stats = fs.statSync(fullPath);
+            // Skip any files or directories (and everything under) that match an exclude glob.
+            if (matchGlobArray(relativePath, exclude)) {
+                continue;
+            }

-                if (stats.isDirectory()) {
-                    // Directories are included if either something under them is included or they
-                    // match an include glob.
-                    if (mapSubdirectory(rootDir, subDir, relativePath, include, exclude, dirMap) ||
-                            matchGlobArray(relativePath, include)) {
-                        dirMap[relativePath] = { subDir: subDir, stats: stats };
-                        itemMapped = true;
-                    }
-                } else if (stats.isFile()) {
-                    // Files are included only if they match an include glob.
-                    if (matchGlobArray(relativePath, include)) {
-                        dirMap[relativePath] = { subDir: subDir, stats: stats };
-                        itemMapped = true;
-                    }
+            // Stats obtained here (required at least to know where to recurse in directories)
+            // are saved for later, where the modified times may also be used. This minimizes
+            // the number of file I/O operations performed.
+            var fullPath = path.join(rootDir, subDir, relativePath);
+            var stats = fs.statSync(fullPath);
+
+            if (stats.isDirectory()) {
+                // Directories are included if either something under them is included or they
+                // match an include glob.
+                if (mapSubdirectory(rootDir, subDir, relativePath, include, exclude, dirMap) ||
+                        matchGlobArray(relativePath, include)) {
+                    dirMap[relativePath] = { subDir: subDir, stats: stats };
+                    itemMapped = true;
+                }
+            } else if (stats.isFile()) {
+                // Files are included only if they match an include glob.
+                if (matchGlobArray(relativePath, include)) {
+                    dirMap[relativePath] = { subDir: subDir, stats: stats };
+                    itemMapped = true;
                }
            }
-        });
+        }
        return itemMapped;
    }

    function matchGlobArray(path, globs) {
-        return globs.some(function(elem) {
-            return minimatch(path, elem, {dot:true});
-        });
+        for (var i in globs) {
+            if (minimatch(path, globs[i])) {
+                return true;
+            }
+        }
+        return false;
    }
 }

@@ -378,7 +384,7 @@ function mergePathMaps(sourceMaps, targetMap, targetDir) {
    // Target stats will be filled in below for targets that exist.
    var pathMap = {};
    sourceMaps.forEach(function (sourceMap) {
-        Object.keys(sourceMap).forEach(function(sourceSubPath){
+        for (var sourceSubPath in sourceMap) {
            var sourceEntry = sourceMap[sourceSubPath];
            pathMap[sourceSubPath] = {
                targetPath: path.join(targetDir, sourceSubPath),
@@ -386,12 +392,12 @@ function mergePathMaps(sourceMaps, targetMap, targetDir) {
                sourcePath: path.join(sourceEntry.subDir, sourceSubPath),
                sourceStats: sourceEntry.stats
            };
-        });
+        }
    });

    // Fill in target stats for targets that exist, and create entries
    // for targets that don't have any corresponding sources.
-    Object.keys(targetMap).forEach(function(subPath){
+    for (var subPath in targetMap) {
        var entry = pathMap[subPath];
        if (entry) {
            entry.targetStats = targetMap[subPath].stats;
@@ -403,7 +409,7 @@ function mergePathMaps(sourceMaps, targetMap, targetDir) {
                sourceStats: null
            };
        }
-    });
+    }

    return pathMap;
 }
--- a/node_modules/cordova-common/src/PlatformJson.js
+++ b/node_modules/cordova-common/src/PlatformJson.js
@@ -162,8 +162,8 @@ PlatformJson.prototype.removePluginMetadata = function (pluginInfo) {
    return this;
 };

-PlatformJson.prototype.addInstalledPluginToPrepareQueue = function(pluginDirName, vars, is_top_level, force) {
-    this.root.prepare_queue.installed.push({'plugin':pluginDirName, 'vars':vars, 'topLevel':is_top_level, 'force':force});
+PlatformJson.prototype.addInstalledPluginToPrepareQueue = function(pluginDirName, vars, is_top_level) {
+    this.root.prepare_queue.installed.push({'plugin':pluginDirName, 'vars':vars, 'topLevel':is_top_level});
 };

 PlatformJson.prototype.addUninstalledPluginToPrepareQueue = function(pluginId, is_top_level) {
@@ -276,3 +276,4 @@ function ModuleMetadata (pluginId, jsModule) {
 }

 module.exports = PlatformJson;
+
--- a/node_modules/cordova-common/src/PluginInfo/PluginInfo.js
+++ b/node_modules/cordova-common/src/PluginInfo/PluginInfo.js
@@ -108,7 +108,6 @@ function PluginInfo(dirname) {
    function _parseDependency(tag) {
        var dep =
            { id : tag.attrib.id
-            , version: tag.attrib.version || ''
            , url : tag.attrib.url || ''
            , subdir : tag.attrib.subdir || ''
            , commit : tag.attrib.commit
@@ -147,22 +146,6 @@ function PluginInfo(dirname) {
        return configFile;
    }

-    self.getEditConfigs = getEditConfigs;
-    function getEditConfigs(platform) {
-        var editConfigs = _getTags(self._et, 'edit-config', platform, _parseEditConfigs);
-        return editConfigs;
-    }
-
-    function _parseEditConfigs(tag) {
-        var editConfig =
-        { file : tag.attrib['file']
-        , target : tag.attrib['target']
-        , mode : tag.attrib['mode']
-        , xmls : tag.getchildren()
-        };
-        return editConfig;
-    }
-
    // <info> tags, both global and within a <platform>
    // TODO (kamrik): Do we ever use <info> under <platform>? Example wanted.
    self.getInfo = getInfo;
@@ -226,8 +209,7 @@ function PluginInfo(dirname) {
                target: tag.attrib.target,
                versions: tag.attrib.versions,
                deviceTarget: tag.attrib['device-target'],
-                arch: tag.attrib.arch,
-                reference: tag.attrib.reference
+                arch: tag.attrib.arch
            };
        });
        return resourceFiles;
@@ -319,15 +301,12 @@ function PluginInfo(dirname) {
                type: el.attrib.type,
                parent: el.attrib.parent,
                custom: isStrTrue(el.attrib.custom),
-                embed: isStrTrue(el.attrib.embed),
                src: el.attrib.src,
-                spec: el.attrib.spec,
                weak: isStrTrue(el.attrib.weak),
                versions: el.attrib.versions,
                targetDir: el.attrib['target-dir'],
                deviceTarget: el.attrib['device-target'] || el.attrib.target,
-                arch: el.attrib.arch,
-                implementation: el.attrib.implementation
+                arch: el.attrib.arch
            };
            return ret;
        });
@@ -403,7 +382,7 @@ function _getTags(pelem, tag, platform, transform) {
    return tags;
 }

-// Same as _getTags() but only looks inside a platform section.
+// Same as _getTags() but only looks inside a platfrom section.
 function _getTagsInPlatform(pelem, tag, platform, transform) {
    var platformTag = pelem.find('./platform[@name="' + platform + '"]');
    var tags = platformTag ? platformTag.findall(tag) : [];
--- a/node_modules/cordova-common/src/PluginManager.js
+++ b/node_modules/cordova-common/src/PluginManager.js
@@ -123,7 +123,7 @@ PluginManager.prototype.doOperation = function (operation, plugin, options) {
        if (operation === PluginManager.INSTALL) {
            // Ignore passed `is_top_level` option since platform itself doesn't know
            // anything about managing dependencies - it's responsibility of caller.
-            self.munger.add_plugin_changes(plugin, options.variables, /*is_top_level=*/true, /*should_increment=*/true, options.force);
+            self.munger.add_plugin_changes(plugin, options.variables, /*is_top_level=*/true, /*should_increment=*/true);
            self.munger.platformJson.addPluginMetadata(plugin);
        } else {
            self.munger.remove_plugin_changes(plugin, /*is_top_level=*/true);
--- a/node_modules/cordova-common/src/events.js
+++ b/node_modules/cordova-common/src/events.js
@@ -20,7 +20,6 @@
 var EventEmitter = require('events').EventEmitter;

 var INSTANCE = new EventEmitter();
-INSTANCE.setMaxListeners(20);
 var EVENTS_RECEIVER;

 module.exports = INSTANCE;
--- a/node_modules/cordova-common/src/superspawn.js
+++ b/node_modules/cordova-common/src/superspawn.js
@@ -167,12 +167,6 @@ exports.spawn = function(cmd, args, opts) {
                errMsg += ' Error output:\n' + capturedErr.trim();
            }
            var err = new Error(errMsg);
-            if (capturedErr) {
-                err.stderr = capturedErr;
-            }
-            if (capturedOut) {
-                err.stdout = capturedOut;
-            }
            err.code = code;
            d.reject(err);
        }
--- a/node_modules/cordova-common/src/util/plist-helpers.js
+++ b/node_modules/cordova-common/src/util/plist-helpers.js
@@ -1,21 +1,21 @@
-/**
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    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
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-*/ 
+/*
+ *
+ * Copyright 2013 Brett Rudd
+ *
+ * Licensed 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/

 // contains PLIST utility functions
 var __     = require('underscore');
--- a/node_modules/cordova-common/src/util/xml-helpers.js
+++ b/node_modules/cordova-common/src/util/xml-helpers.js
@@ -1,21 +1,21 @@
-/**
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    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
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-*/ 
+/*
+ *
+ * Copyright 2013 Anis Kadri
+ *
+ * Licensed 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/

 /* jshint sub:true, laxcomma:true */

@@ -29,9 +29,6 @@ var fs = require('fs')
  , et = require('elementtree')
  ;

-  var ROOT = /^\/([^\/]*)/,
-      ABSOLUTE = /^\/([^\/]*)\/(.*)/;
-
 module.exports = {
    // compare two et.XML nodes, see if they match
    // compares tagName, text, attributes and children (recursively)
@@ -44,9 +41,23 @@ module.exports = {
            return false;
        }

-        if (!attribMatch(one, two)) return false;
+        var oneAttribKeys = Object.keys(one.attrib),
+            twoAttribKeys = Object.keys(two.attrib),
+            i = 0, attribName;

-        for (var i = 0; i < one._children.length; i++) {
+        if (oneAttribKeys.length != twoAttribKeys.length) {
+            return false;
+        }
+
+        for (i; i < oneAttribKeys.length; i++) {
+            attribName = oneAttribKeys[i];
+
+            if (one.attrib[attribName] != two.attrib[attribName]) {
+                return false;
+            }
+        }
+
+        for (i; i < one._children.length; i++) {
            if (!module.exports.equalNodes(one._children[i], two._children[i])) {
                return false;
            }
@@ -57,7 +68,7 @@ module.exports = {

    // adds node to doc at selector, creating parent if it doesn't exist
    graftXML: function(doc, nodes, selector, after) {
-        var parent = module.exports.resolveParent(doc, selector);
+        var parent = resolveParent(doc, selector);
        if (!parent) {
            //Try to create the parent recursively if necessary
            try {
@@ -68,7 +79,7 @@ module.exports = {
            } catch (e) {
                return false;
            }
-            parent = module.exports.resolveParent(doc, selector);
+            parent = resolveParent(doc, selector);
            if (!parent) return false;
        }

@@ -86,54 +97,9 @@ module.exports = {
        return true;
    },

-    // adds new attributes to doc at selector
-    // Will only merge if attribute has not been modified already or --force is used
-    graftXMLMerge: function(doc, nodes, selector, xml) {
-        var target = module.exports.resolveParent(doc, selector);
-        if (!target) return false;
-
-        // saves the attributes of the original xml before making changes
-        xml.oldAttrib = _.extend({}, target.attrib);
-
-        nodes.forEach(function (node) {
-            var attributes = node.attrib;
-            for (var attribute in attributes) {
-                target.attrib[attribute] = node.attrib[attribute];
-            }
-        });
-
-        return true;
-    },
-
-    // overwrite all attributes to doc at selector with new attributes
-    // Will only overwrite if attribute has not been modified already or --force is used
-    graftXMLOverwrite: function(doc, nodes, selector, xml) {
-        var target = module.exports.resolveParent(doc, selector);
-        if (!target) return false;
-
-        // saves the attributes of the original xml before making changes
-        xml.oldAttrib = _.extend({}, target.attrib);
-
-        // remove old attributes from target
-        var targetAttributes = target.attrib;
-        for (var targetAttribute in targetAttributes) {
-            delete targetAttributes[targetAttribute];
-        }
-
-        // add new attributes to target
-        nodes.forEach(function (node) {
-            var attributes = node.attrib;
-            for (var attribute in attributes) {
-                target.attrib[attribute] = node.attrib[attribute];
-            }
-        });
-
-        return true;
-    },
-
    // removes node from doc at selector
    pruneXML: function(doc, nodes, selector) {
-        var parent = module.exports.resolveParent(doc, selector);
+        var parent = resolveParent(doc, selector);
        if (!parent) return false;

        nodes.forEach(function (node) {
@@ -148,36 +114,6 @@ module.exports = {
        return true;
    },

-    // restores attributes from doc at selector
-    pruneXMLRestore: function(doc, selector, xml) {
-        var target = module.exports.resolveParent(doc, selector);
-        if (!target) return false;
-
-        if (xml.oldAttrib) {
-            target.attrib = _.extend({}, xml.oldAttrib);
-        }
-
-        return true;
-    },
-
-    prunXMLRemove: function(doc, selector, nodes) {
-        var target = module.exports.resolveParent(doc, selector);
-        if (!target) return false;
-
-        nodes.forEach(function (node) {
-            var attributes = node.attrib;
-            for (var attribute in attributes) {
-                if (target.attrib[attribute]) {
-                    delete target.attrib[attribute];
-                }
-            }
-        });
-
-        return true;
-
-    },
-
-
    parseElementtreeSync: function (filename) {
        var contents = fs.readFileSync(filename, 'utf-8');
        if(contents) {
@@ -185,30 +121,6 @@ module.exports = {
            contents = contents.substring(contents.indexOf('<'));
        }
        return new et.ElementTree(et.XML(contents));
-    },
-
-    resolveParent: function (doc, selector) {
-        var parent, tagName, subSelector;
-
-        // handle absolute selector (which elementtree doesn't like)
-        if (ROOT.test(selector)) {
-            tagName = selector.match(ROOT)[1];
-            // test for wildcard "any-tag" root selector
-            if (tagName == '*' || tagName === doc._root.tag) {
-                parent = doc._root;
-
-                // could be an absolute path, but not selecting the root
-                if (ABSOLUTE.test(selector)) {
-                    subSelector = selector.match(ABSOLUTE)[2];
-                    parent = parent.find(subSelector);
-                }
-            } else {
-                return false;
-            }
-        } else {
-            parent = doc.find(selector);
-        }
-        return parent;
    }
 };

@@ -240,6 +152,33 @@ function uniqueChild(node, parent) {
    }
 }

+var ROOT = /^\/([^\/]*)/,
+    ABSOLUTE = /^\/([^\/]*)\/(.*)/;
+
+function resolveParent(doc, selector) {
+    var parent, tagName, subSelector;
+
+    // handle absolute selector (which elementtree doesn't like)
+    if (ROOT.test(selector)) {
+        tagName = selector.match(ROOT)[1];
+        // test for wildcard "any-tag" root selector
+        if (tagName == '*' || tagName === doc._root.tag) {
+            parent = doc._root;
+
+            // could be an absolute path, but not selecting the root
+            if (ABSOLUTE.test(selector)) {
+                subSelector = selector.match(ABSOLUTE)[2];
+                parent = parent.find(subSelector);
+            }
+        } else {
+            return false;
+        }
+    } else {
+        parent = doc.find(selector);
+    }
+    return parent;
+}
+
 // Find the index at which to insert an entry. After is a ;-separated priority list
 // of tags after which the insertion should be made. E.g. If we need to
 // insert an element C, and the rule is that the order of children has to be
@@ -290,44 +229,47 @@ function mergeXml(src, dest, platform, clobber) {
            query = srcTag + '',
            shouldMerge = true;

-        if (BLACKLIST.indexOf(srcTag) !== -1) return;
-
-        if (SINGLETONS.indexOf(srcTag) !== -1) {
-            foundChild = dest.find(query);
-            if (foundChild) {
-                destChild = foundChild;
-                dest.remove(destChild);
+        if (BLACKLIST.indexOf(srcTag) === -1) {
+            if (SINGLETONS.indexOf(srcTag) !== -1) {
+                foundChild = dest.find(query);
+                if (foundChild) {
+                    destChild = foundChild;
+                    dest.remove(destChild);
+                }
+            } else {
+                //Check for an exact match and if you find one don't add
+                Object.getOwnPropertyNames(srcChild.attrib).forEach(function (attribute) {
+                    query += '[@' + attribute + '="' + srcChild.attrib[attribute] + '"]';
+                });
+                var foundChildren = dest.findall(query);
+                for(var i = 0; i < foundChildren.length; i++) {
+                    foundChild = foundChildren[i];
+                    if (foundChild && textMatch(srcChild, foundChild) && (Object.keys(srcChild.attrib).length==Object.keys(foundChild.attrib).length)) {
+                        destChild = foundChild;
+                        dest.remove(destChild);
+                        shouldMerge = false;
+                        break;
+                    }
+                }
            }
-        } else {
-            //Check for an exact match and if you find one don't add
-            var mergeCandidates = dest.findall(query)
-            .filter(function (foundChild) {
-                return foundChild && textMatch(srcChild, foundChild) && attribMatch(srcChild, foundChild);
-            });

-            if (mergeCandidates.length > 0) {
-                destChild = mergeCandidates[0];
-                dest.remove(destChild);
-                shouldMerge = false;
-            }
+            mergeXml(srcChild, destChild, platform, clobber && shouldMerge);
+            dest.append(destChild);
        }
-
-        mergeXml(srcChild, destChild, platform, clobber && shouldMerge);
-        dest.append(destChild);
    }
-
+    
    function removeDuplicatePreferences(xml) {
        // reduce preference tags to a hashtable to remove dupes
        var prefHash = xml.findall('preference[@name][@value]').reduce(function(previousValue, currentValue) {
            previousValue[ currentValue.attrib.name ] = currentValue.attrib.value;
            return previousValue;
        }, {});
-
+        
        // remove all preferences
        xml.findall('preference[@name][@value]').forEach(function(pref) {
            xml.remove(pref);
        });
-
+        
        // write new preferences
        Object.keys(prefHash).forEach(function(key, index) {
            var element = et.SubElement(xml, 'preference');
@@ -345,22 +287,3 @@ function textMatch(elm1, elm2) {
        text2 = elm2.text ? elm2.text.replace(/\s+/, '') : '';
    return (text1 === '' || text1 === text2);
 }
-
-function attribMatch(one, two) {
-    var oneAttribKeys = Object.keys(one.attrib);
-    var twoAttribKeys = Object.keys(two.attrib);
-
-    if (oneAttribKeys.length != twoAttribKeys.length) {
-        return false;
-    }
-
-    for (var i = 0; i < oneAttribKeys.length; i++) {
-        var attribName = oneAttribKeys[i];
-
-        if (one.attrib[attribName] != two.attrib[attribName]) {
-            return false;
-        }
-    }
-
-    return true;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vladimir Kotikov	35dfdece12	CB-11550 Updated RELEASENOTES for release 5.2.1	2016-07-11 13:43:57 +03:00
Vladimir Kotikov	cbed234069	CB-11550 Set VERSION to 5.2.1 (via coho)	2016-07-11 13:43:57 +03:00
Vladimir Kotikov	81b2bccd97	CB-11550 Update JS snapshot to version 5.2.1 (via coho)	2016-07-11 13:43:57 +03:00
Vladimir Kotikov	89a00c02a4	CB-11550 Updated and checked-in node_modules	2016-07-11 13:41:00 +03:00
Alexander Sorokin	40d3cdc0d6	CB-9489 Fixed "endless waiting for emulator" issue	2016-07-11 13:11:04 +03:00
Vivek Kiran	8416c4e5e9	CB-11481: android-library is deprecated use com.android.library instead	2016-07-11 13:11:03 +03:00
Steve Gill	97ce7dd417	Set VERSION to 5.2.0 (via coho)	2016-06-29 12:51:05 -07:00
Steve Gill	b32b8c89c6	Update JS snapshot to version 5.2.0 (via coho)	2016-06-29 12:51:05 -07:00
Steve Gill	fd1d3006c0	CB-11444 Updated RELEASENOTES and Version for release 5.2.0	2016-06-29 12:39:42 -07:00
@@ -1 +1 @@
 .2.3
 .2.1
				`@@ -1 +0,0 @@`
				`//This file is intentionally just a comment`