Merge branch 'master' into 4.0.x (gradle fixes)

bin/templates/project/AndroidManifest.xml

@@ -33,7 +33,7 @@
     <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"

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+'
     }
 }
 
@@ -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) {
@@ -109,7 +129,28 @@ 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
 }
+
+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')
+    }
+}
+
+

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")