diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-12-09 14:33:36 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-12-09 14:33:36 +0100 |
| commit | 16e3c07cf116bb4d61a3d30a3841576523e7dbc2 (patch) | |
| tree | 7d794290b9cf96e22602ea7002c8239b58849d01 | |
| parent | 78370094e9c9c2f58cb5f969217db555f9a283c2 (diff) | |
| parent | 0193cdb194b76acbc75742e46d186e5bc4a0b159 (diff) | |
Merge pull request #710 from betheg/as
update android gradle plugin to 0.14.4
Diffstat (limited to '')
| -rw-r--r-- | build.gradle | 21 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rw-r--r-- | libs/minidns/build.gradle | 7 |
3 files changed, 15 insertions, 17 deletions
diff --git a/build.gradle b/build.gradle index 48dac0c7..51327d45 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.2' + classpath 'com.android.tools.build:gradle:1.0.0' } } @@ -81,18 +81,13 @@ 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") - } - } + applicationVariants.all { variant -> + if (variant.name.equals('release')) { + 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")) + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e61d1fd..81cfe7fe 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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.1-all.zip diff --git a/libs/minidns/build.gradle b/libs/minidns/build.gradle index 5941beaf..c9b93467 100644 --- a/libs/minidns/build.gradle +++ b/libs/minidns/build.gradle @@ -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() -isSNAPSHOT = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() == 'master' + +ext { + isSNAPSHOT = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() == 'master' +} if (isSNAPSHOT) { version = version + '-SNAPSHOT' @@ -74,4 +77,4 @@ modifyPom { } dependencies { -}
\ No newline at end of file +} |