You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/09/16 19:04:11 UTC
[1/5] android commit: Second part of CB-7499,
support RTL text direction
Repository: cordova-android
Updated Branches:
refs/heads/4.0.x a10106c61 -> 8f27b2ab5
Second part of CB-7499, support RTL text direction
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d9900a72
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d9900a72
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d9900a72
Branch: refs/heads/4.0.x
Commit: d9900a725d84c5629cdb0f783b7ef99ac9d8bb72
Parents: 5cb01f2
Author: mbillau <mi...@gmail.com>
Authored: Tue Sep 9 09:38:15 2014 -0400
Committer: mbillau <mi...@gmail.com>
Committed: Mon Sep 15 16:03:00 2014 -0400
----------------------------------------------------------------------
bin/templates/project/AndroidManifest.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d9900a72/bin/templates/project/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/AndroidManifest.xml b/bin/templates/project/AndroidManifest.xml
index cea9dc3..603f4a7 100644
--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@ -31,7 +31,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<application android:icon="@drawable/icon" android:label="@string/app_name"
- android:hardwareAccelerated="true">
+ android:hardwareAccelerated="true" android:supportsRtl="true">
<activity android:name="__ACTIVITY__"
android:label="@string/activity_name"
android:launchMode="singleTop"
[4/5] android commit: CB-7512 Add gradle environment vars for signing
apks
Posted by ag...@apache.org.
CB-7512 Add gradle environment vars for signing apks
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/25be42d3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/25be42d3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/25be42d3
Branch: refs/heads/4.0.x
Commit: 25be42d3857c0d841db899ce226836f466b71dcb
Parents: 00f6d30
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 13:01:25 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 13:01:25 2014 -0400
----------------------------------------------------------------------
bin/templates/project/build.gradle | 41 +++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/25be42d3/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index e76634f..a1f74b9 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -89,6 +89,26 @@ android {
targetCompatibility JavaVersion.VERSION_1_7
}
+ if (System.env.RELEASE_SIGNING_PROPERTIES_FILE) {
+ signingConfigs {
+ release {
+ // These must be set or Gradle will complain (even if they are overridden).
+ keyAlias = ""
+ keyPassword = ""
+ storeFile = null
+ storePassword = ""
+ }
+ }
+ buildTypes {
+ release {
+ signingConfig signingConfigs.release
+ }
+ }
+ addSigningProps(System.env.RELEASE_SIGNING_PROPERTIES_FILE, signingConfigs.release)
+ }
+ if (System.env.DEBUG_SIGNING_PROPERTIES_FILE) {
+ addSigningProps(System.env.DEBUG_SIGNING_PROPERTIES_FILE, signingConfigs.debug)
+ }
}
task wrapper(type: Wrapper) {
@@ -113,3 +133,24 @@ def getProjectList() {
}
return projects
}
+
+def ensureValueExists(filePath, props, key) {
+ if (props.get(key) == null) {
+ throw new GradleException(filePath + ': Missing key required "' + key + '"')
+ }
+ return props.get(key)
+}
+
+def addSigningProps(propsFilePath, signingConfig) {
+ def propsFile = file(propsFilePath)
+ propsFile.withReader { reader ->
+ def props = new Properties()
+ props.load(reader)
+ signingConfig.keyAlias = ensureValueExists(propsFilePath, props, 'keyAlias')
+ signingConfig.keyPassword = ensureValueExists(propsFilePath, props, 'keyPassword')
+ signingConfig.storeFile = RelativePath.parse(true, ensureValueExists(propsFilePath, props, 'storeFile')).getFile(propsFile.getParentFile())
+ signingConfig.storePassword = ensureValueExists(propsFilePath, props, 'storePassword')
+ }
+}
+
+
[3/5] android commit: CB-7512 Change gradle android plugins from 0.10
-> 0.12
Posted by ag...@apache.org.
CB-7512 Change gradle android plugins from 0.10 -> 0.12
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/00f6d30e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/00f6d30e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/00f6d30e
Branch: refs/heads/4.0.x
Commit: 00f6d30e081c6a81ad0fb2aeb437f3840a73f39c
Parents: 090822e
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 13:00:27 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 13:00:27 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 2 +-
bin/templates/project/build.gradle | 4 ++--
bin/templates/project/cordova.gradle | 2 +-
framework/build.gradle | 7 ++++++-
4 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/00f6d30e/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index df2448c..585b7af 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -236,7 +236,7 @@ var builders = {
// Find the recently-generated output APK files
// Gradle can generate multiple output files; return all of them.
getOutputFiles: function(build_type) {
- var binDir = path.join(ROOT, 'build', 'apk');
+ var binDir = path.join(ROOT, 'build', 'outputs', 'apk');
var candidates = find_files(binDir, function(candidate) {
// Need to choose between release and debug .apk.
if (build_type === 'debug') {
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/00f6d30e/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index e3468d8..e76634f 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -29,7 +29,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.10.+'
+ classpath 'com.android.tools.build:gradle:0.12.0+'
}
}
@@ -109,7 +109,7 @@ def getProjectList() {
def matcher = pattern.matcher(manifestFile.getText())
def projects = []
while (matcher.find()) {
- projects.add(":" + matcher.group(2).replace("/",":"))
+ projects.add(":" + matcher.group(2).replace("/",":"))
}
return projects
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/00f6d30e/bin/templates/project/cordova.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle
index 6c7d0ab..ba73c93 100644
--- a/bin/templates/project/cordova.gradle
+++ b/bin/templates/project/cordova.gradle
@@ -116,5 +116,5 @@ String getAndroidSdkDir() {
}
cordovaSdkVersion = getProjectTarget("android-19")
-cordovaBuildToolsVersion = latestBuildToolsAvailable("19.0.0")
+cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/00f6d30e/framework/build.gradle
----------------------------------------------------------------------
diff --git a/framework/build.gradle b/framework/build.gradle
index 59e1ae7..6ca284d 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -25,7 +25,12 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.10.+'
+ // This should be updated with each cordova-android release.
+ // It can affect things like where the .apk is generated.
+ // It also dictates what the minimum android build-tools version
+ // that you need (Set in bin/templates/project/cordova.gradle).
+ // Be sure to also update the value in bin/templates/project.
+ classpath 'com.android.tools.build:gradle:0.12.+'
}
}
[5/5] android commit: Merge branch 'master' into 4.0.x (gradle fixes)
Posted by ag...@apache.org.
Merge branch 'master' into 4.0.x (gradle fixes)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/8f27b2ab
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/8f27b2ab
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/8f27b2ab
Branch: refs/heads/4.0.x
Commit: 8f27b2ab56d84d8fb8cf94056ca6c1549e761069
Parents: a10106c 25be42d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 13:02:55 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 13:02:55 2014 -0400
----------------------------------------------------------------------
bin/lib/check_reqs.js | 12 +++++--
bin/templates/cordova/lib/build.js | 2 +-
bin/templates/project/AndroidManifest.xml | 2 +-
bin/templates/project/build.gradle | 45 ++++++++++++++++++++++++--
bin/templates/project/cordova.gradle | 2 +-
framework/build.gradle | 7 +++-
6 files changed, 61 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8f27b2ab/bin/templates/project/AndroidManifest.xml
----------------------------------------------------------------------
diff --cc bin/templates/project/AndroidManifest.xml
index 0184046,603f4a7..b3b499f
--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@@ -29,11 -29,9 +29,11 @@@
/>
<uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<application android:icon="@drawable/icon" android:label="@string/app_name"
- android:hardwareAccelerated="true">
+ android:hardwareAccelerated="true" android:supportsRtl="true">
<activity android:name="__ACTIVITY__"
android:label="@string/activity_name"
android:launchMode="singleTop"
[2/5] android commit: CB-7536 check_reqs: windows tweaks + sdk
manager error message
Posted by ag...@apache.org.
CB-7536 check_reqs: windows tweaks + sdk manager error message
1. Don't escape \s since those are used by windows for directory seperators
2. Don't warn about missing directories on windows when we're just
testing for their existence
3. Don't give command to install sdk from command-line, since they also
require Build-tools and Platform-tools (which are not installed by
default with IDE-less SDK installer).
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/090822eb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/090822eb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/090822eb
Branch: refs/heads/4.0.x
Commit: 090822eb4196e81063b7b3ffd04705fe706384ef
Parents: d9900a7
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 10:28:34 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 11:13:15 2014 -0400
----------------------------------------------------------------------
bin/lib/check_reqs.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/090822eb/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 358c73f..a7410e9 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -110,10 +110,13 @@ module.exports.check_java = function() {
}
} else if (isWindows) {
// Try to auto-detect java in the default install paths.
+ var oldSilent = shelljs.config.silent;
+ shelljs.config.silent = true;
var firstJdkDir =
shelljs.ls(process.env['ProgramFiles'] + '\\java\\jdk*')[0] ||
shelljs.ls('C:\\Program Files\\java\\jdk*')[0] ||
shelljs.ls('C:\\Program Files (x86)\\java\\jdk*')[0];
+ shelljs.config.silent = oldSilent;
if (firstJdkDir) {
// shelljs always uses / in paths.
firstJdkDir = firstJdkDir.replace(/\//g, path.sep);
@@ -195,7 +198,7 @@ module.exports.check_android = function() {
};
module.exports.getAbsoluteAndroidCmd = function() {
- return forgivingWhichSync('android').replace(/([ \\])/g, '\\$1');
+ return forgivingWhichSync('android').replace(/(\s)/g, '\\$1');
};
module.exports.check_android_target = function(valid_target) {
@@ -209,9 +212,12 @@ module.exports.check_android_target = function(valid_target) {
.then(function(output) {
if (output.split('\n').indexOf(valid_target) == -1) {
var androidCmd = module.exports.getAbsoluteAndroidCmd();
- throw new Error('Please install Android target: "' + valid_target + '".\n' +
+ throw new Error('Please install Android target: "' + valid_target + '".\n\n' +
'Hint: Open the SDK manager by running: ' + androidCmd + '\n' +
- 'Or install directly via: ' + androidCmd + ' update sdk --no-ui --all --filter "' + valid_target + '"');
+ 'You will require:\n' +
+ '1. "SDK Platform" for ' + valid_target + '\n' +
+ '2. "Android SDK Platform-tools (latest)\n' +
+ '3. "Android SDK Build-tools" (latest)');
}
});
};