narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

Merge pull request #710 from betheg/as

Browse source 
update android gradle plugin to 0.14.4
This commit is contained in:
Daniel Gultsch 2014-12-09 14:33:36 +01:00
parent 78370094e9 0193cdb194
commit 16e3c07cf1
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.12.2' classpath 'com.android.tools.build:gradle:1.0.0'
} }
} }
@ -81,17 +81,12 @@ android {
buildTypes.release.signingConfig = null buildTypes.release.signingConfig = null
} }
buildTypes {
applicationVariants.all { variant -> 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')) { if (variant.name.equals('release')) {
variant.outputFile = new File(variant.outputFile.parent, variant.outputs.each { output ->
rootProject.name + "-" + defaultConfig.versionName + ".apk") 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"))
} }
} }
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013 #Sat Nov 22 17:47:57 CET 2014
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

3
libs/minidns/build.gradle
View file

@ -19,7 +19,10 @@ group = 'de.measite.minidns'
description = "A minimal DNS client library with support for A, AAAA, NS and SRV records" description = "A minimal DNS client library with support for A, AAAA, NS and SRV records"
sourceCompatibility = 1.7 sourceCompatibility = 1.7
version = 'git tag --points-at HEAD'.execute().text.trim() version = 'git tag --points-at HEAD'.execute().text.trim()
ext {
isSNAPSHOT = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() == 'master' isSNAPSHOT = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() == 'master'
}
if (isSNAPSHOT) { if (isSNAPSHOT) {
version = version + '-SNAPSHOT' version = version + '-SNAPSHOT'