Bump gradle plugin version to 0.14.1, upgrade properties
This commit is contained in:
parent
e6bce05bd2
commit
c6811d83b2
18
build.gradle
18
build.gradle
@ -3,14 +3,18 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:0.12.2'
|
classpath 'com.android.tools.build:gradle:0.14.1'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'android'
|
apply plugin: 'android'
|
||||||
|
|
||||||
def toolVersion = "21.1"
|
allprojects {
|
||||||
sdkLoc = getSdkPath()
|
ext {
|
||||||
|
toolVersion = '21.1'
|
||||||
|
sdkLoc = getSdkPath()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
FileCollection getAndroidPrebuilt(String apiLevel) {
|
FileCollection getAndroidPrebuilt(String apiLevel) {
|
||||||
files("$sdkLoc/platforms/android-$apiLevel/android.jar")
|
files("$sdkLoc/platforms/android-$apiLevel/android.jar")
|
||||||
@ -98,13 +102,11 @@ android {
|
|||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
runProguard false
|
minifyEnabled false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(Compile) { task ->
|
compileOptions.encoding = "UTF-8"
|
||||||
options.encoding = "UTF-8"
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -168,5 +170,5 @@ subprojects {
|
|||||||
* of this method to reflect that.
|
* of this method to reflect that.
|
||||||
*/
|
*/
|
||||||
def getSdkPath() {
|
def getSdkPath() {
|
||||||
new File( "$android.adbExe/../../" ).canonicalPath
|
new File("$android.adbExe/../../").canonicalPath
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user