Updating RELEASENOTES

(cherry picked from commit 8983ddbdcc)

RELEASENOTES.md

@@ -22,6 +22,10 @@
 Update these notes using: git log --pretty=format:'* %s' --topo-order --no-merges *remote*/4.1.x...HEAD
 
 ### Release 4.1.0 (Jul 2015) ###
+
+* CB-9185 Fixed an issue when unsigned apks couldn't be found. This closes #202
+* CB-9397 Fixes minor issues with `cordova requirements android`
+* CB-9389 Fixes build/check_reqs hang
 * CB-9392 Fixed printing flavored versions. This closes #184.
 * CB-9382 [Android] Fix KeepRunning setting when Plugin activity is showed. This closes #200
 * CB-9391 Fixes cdvBuildMultipleApks option casting

VERSION

@@ -1 +1 @@
-4.1.0-dev
+4.1.0

bin/lib/check_reqs.js

@@ -82,15 +82,16 @@ module.exports.check_ant = function() {
 // Returns a promise. Called only by build and clean commands.
 module.exports.check_gradle = function() {
     var sdkDir = process.env['ANDROID_HOME'];
-    var message = 'Could not find gradle wrapper within Android SDK. ';
-    if (!sdkDir) return Q.reject(message + 'Might need to install Android SDK or set up \'ADROID_HOME\' env variable.');
-    var wrapper = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper', 'gradlew');
-    return tryCommand('"' + wrapper + '" -v', message + 'Might need to update your Android SDK.\n' +
-            'Looked here: ' + path.dirname(wrapper))
-    .then(function (output) {
-        // Parse Gradle version from command output
-        return/^gradle ((?:\d+\.)+(?:\d+))/gim.exec(output)[1];
-    });
+    if (!sdkDir)
+        return Q.reject('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 wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
+    if (!fs.existsSync(wrapperDir)) {
+        return Q.reject(new Error('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.
@@ -315,7 +316,7 @@ module.exports.check_all = function() {
             requirement.installed = true;
             requirement.metadata.version = version;
         }, function (err) {
-            requirement.metadata.reason = err;
+            requirement.metadata.reason = err instanceof Error ? err.message : err;
         });
     }, Q())
     .then(function () {

bin/templates/cordova/lib/build.js

@@ -74,7 +74,7 @@ function findOutputApksHelper(dir, build_type, arch) {
             return /-debug/.exec(candidate) && !/-unaligned|-unsigned/.exec(candidate);
         }
         if (build_type === 'release') {
-            return /-release/.exec(candidate) && !/-unaligned|-unsigned/.exec(candidate);
+            return /-release/.exec(candidate) && !/-unaligned/.exec(candidate);
         }
         return true;
     });
@@ -82,7 +82,7 @@ function findOutputApksHelper(dir, build_type, arch) {
     if (ret.length === 0) {
         return ret;
     }
-    // Assume arch-specific build if newest api has -x86 or -arm.
+    // Assume arch-specific build if newest apk has -x86 or -arm.
     var archSpecific = !!/-x86|-arm/.exec(ret[0]);
     // And show only arch-specific ones (or non-arch-specific)
     ret = ret.filter(function(p) {
@@ -90,11 +90,12 @@ function findOutputApksHelper(dir, build_type, arch) {
         return !!/-x86|-arm/.exec(p) == archSpecific;
         /*jshint +W018 */
     });
-    if (arch && ret.length > 1) {
+    if (archSpecific && ret.length > 1) {
         ret = ret.filter(function(p) {
             return p.indexOf('-' + arch) != -1;
         });
     }
+
     return ret;
 }
 

bin/templates/cordova/version

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

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

@@ -1,5 +1,5 @@
 // Platform: android
-// 23738581906992092a43ad2e643b1e0c43bba38a
+// a83e94b489774dc8e514671e81c6154eda650af1
 /*
  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.1.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '4.1.0';
 // file: src/scripts/require.js
 
 /*jshint -W079 */
@@ -328,7 +328,7 @@ module.exports = cordova;
 
 });
 
-// file: node_modules/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) {
 
 /**
@@ -351,7 +351,7 @@ module.exports = {
 
 });
 
-// file: node_modules/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) {
 
 /**
@@ -861,7 +861,7 @@ module.exports = channel;
 
 });
 
-// file: node_modules/cordova-android/cordova-js-src/exec.js
+// file: D:/cordova/cordova-android/cordova-js-src/exec.js
 define("cordova/exec", function(require, exports, module) {
 
 /**
@@ -896,11 +896,7 @@ 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,
-        // Uses reflection to access private APIs of the WebView that can send JS
-        // to be executed.
-        // Requires Android 3.2.4 or above.
-        PRIVATE_API: 3
+        ONLINE_EVENT: 2
     },
     jsToNativeBridgeMode,  // Set lazily.
     nativeToJsBridgeMode = nativeToJsModes.ONLINE_EVENT,
@@ -1504,7 +1500,7 @@ exports.reset();
 
 });
 
-// file: node_modules/cordova-android/cordova-js-src/platform.js
+// file: D:/cordova/cordova-android/cordova-js-src/platform.js
 define("cordova/platform", function(require, exports, module) {
 
 module.exports = {
@@ -1580,7 +1576,7 @@ function onMessageFromNative(msg) {
 
 });
 
-// file: node_modules/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');

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

package.json

@@ -1,6 +1,6 @@
 {
     "name": "cordova-android",
-    "version": "4.1.0-dev",
+    "version": "4.1.0",
     "description": "cordova-android release",
     "main": "bin/create",
     "repository": {