CB-8834 Don't fail to install on VERSION_DOWNGRADE

VERSION

@@ -1 +1 @@
-4.0.0-dev
+4.0.0

bin/templates/cordova/lib/device.js

@@ -98,7 +98,7 @@ module.exports.install = function(target, buildResults) {
         var launchName = appinfo.getActivityName();
         console.log('Using apk: ' + apk_path);
         console.log('Installing app on device...');
-        var cmd = 'adb -s ' + resolvedTarget.target + ' install -r "' + apk_path + '"';
+        var cmd = 'adb -s ' + resolvedTarget.target + ' install -r -d "' + apk_path + '"';
         return exec(cmd, os.tmpdir())
         .then(function(output) {
             if (output.match(/Failure/)) return Q.reject('ERROR: Failed to install apk to device: ' + output);

bin/templates/cordova/lib/emulator.js

@@ -308,7 +308,7 @@ module.exports.install = function(target, buildResults) {
         var apk_path = build.findBestApkForArchitecture(buildResults, resolvedTarget.arch);
         console.log('Installing app on emulator...');
         console.log('Using apk: ' + apk_path);
-        return exec('adb -s ' + resolvedTarget.target + ' install -r "' + apk_path + '"', os.tmpdir())
+        return exec('adb -s ' + resolvedTarget.target + ' install -r -d "' + apk_path + '"', os.tmpdir())
         .then(function(output) {
             if (output.match(/Failure/)) {
                 return Q.reject('Failed to install apk to emulator: ' + output);

bin/templates/cordova/version

@@ -20,6 +20,6 @@
 */
 
 // Coho updates this line:
-var VERSION = "4.0.0-dev";
+var VERSION = "4.0.0";
 
 console.log(VERSION);

bin/templates/project/assets/www/cordova.js

@@ -1,5 +1,5 @@
 // Platform: android
-// fc4db9145934bd0053161cbf9ffc0caf83b770c6
+// b4af1c5ec477dd98cd651932ea6df6d46705d7f9
 /*
  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 = '4.0.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '4.0.0';
 // file: src/scripts/require.js
 
 /*jshint -W079 */
@@ -101,6 +101,8 @@ if (typeof module === "object" && typeof require === "function") {
 // file: src/cordova.js
 define("cordova", function(require, exports, module) {
 
+if ("cordova" in window) { throw new Error("cordova already defined"); };
+
 
 var channel = require('cordova/channel');
 var platform = require('cordova/platform');

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 = "4.0.0-dev";
+    public static final String CORDOVA_VERSION = "4.0.0";
 
     void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
 

package.json

@@ -1,31 +1,31 @@
 {
-  "name": "cordova-android",
+    "name": "cordova-android",
-  "version": "4.0.0-dev",
+    "version": "4.0.0",
-  "description": "cordova-android release",
+    "description": "cordova-android release",
-  "main": "bin/create",
+    "main": "bin/create",
-  "repository": {
+    "repository": {
-    "type": "git",
+        "type": "git",
-    "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
+        "url": "https://git-wip-us.apache.org/repos/asf/cordova-android.git"
-  },
+    },
-  "keywords": [
+    "keywords": [
-    "android",
+        "android",
-    "cordova",
+        "cordova",
-    "apache"
+        "apache"
-  ],
+    ],
-  "scripts": {
+    "scripts": {
-    "test": "npm run jshint && jasmine-node --color spec",
+        "test": "npm run jshint && jasmine-node --color spec",
-    "test-build": "rm -rf \"test create\"; ./bin/create \"test create\" com.test.app 応用 && \"./test create/cordova/build\" && rm -rf \"test create\"",
+        "test-build": "rm -rf \"test create\"; ./bin/create \"test create\" com.test.app 応用 && \"./test create/cordova/build\" && rm -rf \"test create\"",
-    "jshint": "node node_modules/jshint/bin/jshint bin && node node_modules/jshint/bin/jshint spec"
+        "jshint": "node node_modules/jshint/bin/jshint bin && node node_modules/jshint/bin/jshint spec"
-  },
+    },
-  "author": "Apache Software Foundation",
+    "author": "Apache Software Foundation",
-  "license": "Apache version 2.0",
+    "license": "Apache version 2.0",
-  "dependencies": {
+    "dependencies": {
-    "q": "^0.9.0",
+        "q": "^0.9.0",
-    "shelljs": "^0.2.6"
+        "shelljs": "^0.2.6"
-  },
+    },
-  "devDependencies": {
+    "devDependencies": {
-    "jasmine-node": "^1.14.5",
+        "jasmine-node": "^1.14.5",
-    "jshint": "^2.6.0",
+        "jshint": "^2.6.0",
-    "promise-matchers": "~0"
+        "promise-matchers": "~0"
-  }
+    }
-}
+}