From f2214418774572829fbbc4484bff03bd34ccc5a7 Mon Sep 17 00:00:00 2001 From: Marcel Kinard Date: Fri, 12 Sep 2014 16:01:27 -0400 Subject: [PATCH 1/3] Update JS snapshot to version 3.7.0-dev (via coho) --- framework/assets/www/cordova.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js index 3838e63f..c9e69350 100644 --- a/framework/assets/www/cordova.js +++ b/framework/assets/www/cordova.js @@ -1,5 +1,5 @@ // Platform: android -// 3.7.0-dev-8f41e8d +// 3.7.0-dev-1258511 /* 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 CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-8f41e8d'; +var CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-1258511'; // file: src/scripts/require.js /*jshint -W079 */ From f9b89e98c28393625dc00296ab95a55d953b6ff7 Mon Sep 17 00:00:00 2001 From: Michal Mocny Date: Fri, 12 Sep 2014 17:00:29 -0400 Subject: [PATCH 2/3] Fix invalid syntax (missing + in multiline string) --- bin/templates/cordova/lib/emulator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js index 4c3d451e..0b9747de 100644 --- a/bin/templates/cordova/lib/emulator.js +++ b/bin/templates/cordova/lib/emulator.js @@ -166,7 +166,7 @@ module.exports.start = function(emulator_ID) { var androidCmd = check_reqs.getAbsoluteAndroidCmd(); return Q.reject('ERROR : 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' + '2. Create an AVD by running: ' + androidCmd + ' avd\n' + 'HINT: For a faster emulator, use an Intel System Image and install the HAXM device driver\n'); } }); From 4be92f285a7c9a793815456860e33dad3eb76d03 Mon Sep 17 00:00:00 2001 From: Ian Clelland Date: Mon, 15 Sep 2014 12:15:32 -0400 Subject: [PATCH 3/3] CB-7512: Fix logic for detecting SDK directory --- bin/templates/project/cordova.gradle | 29 +++++++++++++--------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle index f552a470..6c7d0ab3 100644 --- a/bin/templates/project/cordova.gradle +++ b/bin/templates/project/cordova.gradle @@ -84,9 +84,13 @@ int compareVersions(String a, String b) { String getAndroidSdkDir() { def rootDir = project.rootDir + def androidSdkDir = null + String envVar = System.getenv("ANDROID_HOME") def localProperties = new File(rootDir, 'local.properties') - def androidSdkDir = "" - if (localProperties.exists()) { + String systemProperty = System.getProperty("android.home") + if (envVar != null) { + androidSdkDir = envVar + } else if (localProperties.exists()) { Properties properties = new Properties() localProperties.withInputStream { instr -> properties.load(instr) @@ -98,23 +102,16 @@ String getAndroidSdkDir() { sdkDirProp = properties.getProperty('android.dir') if (sdkDirProp != null) { androidSdkDir = (new File(rootDir, sdkDirProp)).getAbsolutePath() - } else { - throw new RuntimeException( - "No sdk.dir property defined in local.properties file.") - } - } - } else { - String envVar = System.getenv("ANDROID_HOME") - if (envVar != null) { - androidSdkDir = envVar - } else { - String property = System.getProperty("android.home") - if (property != null) { - androidSdkDir = property } } } - println androidSdkDir + if (androidSdkDir == null && systemProperty != null) { + androidSdkDir = systemProperty + } + if (androidSdkDir == null) { + throw new RuntimeException( + "Unable to determine Android SDK directory.") + } androidSdkDir }