update android gradle plugin to 0.14.4
to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2.
This commit is contained in:
parent
49403fda84
commit
868d9f890c
15
build.gradle
15
build.gradle
|
@ -6,7 +6,7 @@ buildscript {
|
|||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:0.12.2'
|
||||
classpath 'com.android.tools.build:gradle:0.14.4'
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -81,17 +81,12 @@ android {
|
|||
buildTypes.release.signingConfig = null
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
applicationVariants.all { variant ->
|
||||
def fileName = variant.packageApplication.outputFile.name.replace(".apk",
|
||||
"-" + defaultConfig.versionName + ".apk")
|
||||
variant.packageApplication.outputFile = new
|
||||
File(variant.packageApplication.outputFile.parent, fileName)
|
||||
if (variant.zipAlign) {
|
||||
if (variant.name.equals('release')) {
|
||||
variant.outputFile = new File(variant.outputFile.parent,
|
||||
rootProject.name + "-" + defaultConfig.versionName + ".apk")
|
||||
}
|
||||
variant.outputs.each { output ->
|
||||
output.zipAlign.outputFile = new File(output.outputFile.parent, rootProject.name + "-${variant.versionName}.apk")
|
||||
output.packageApplication.outputFile = new File(output.outputFile.parent, output.packageApplication.outputFile.name
|
||||
.replace(".apk", "-${variant.versionName}.apk"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#Wed Apr 10 15:27:10 PDT 2013
|
||||
#Sat Nov 22 17:47:57 CET 2014
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
|
||||
|
|
|
@ -19,7 +19,10 @@ group = 'de.measite.minidns'
|
|||
description = "A minimal DNS client library with support for A, AAAA, NS and SRV records"
|
||||
sourceCompatibility = 1.7
|
||||
version = 'git tag --points-at HEAD'.execute().text.trim()
|
||||
|
||||
ext {
|
||||
isSNAPSHOT = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() == 'master'
|
||||
}
|
||||
|
||||
if (isSNAPSHOT) {
|
||||
version = version + '-SNAPSHOT'
|
||||
|
|
Loading…
Reference in New Issue