cogentleman/xmpp_client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update android sdk and support library.

Browse Source 
make use of the archivesBaseName and
rename only 'zipaligned' release build.
This commit is contained in:
Michael 2015-08-24 10:59:52 +02:00
parent deb9c20e5e
commit 5f0ed62833
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.2.3' classpath 'com.android.tools.build:gradle:1.3.1'
} }
} }
@ -27,7 +27,7 @@ repositories {
dependencies { dependencies {
compile project(':libs:openpgp-api-lib') compile project(':libs:openpgp-api-lib')
compile project(':libs:MemorizingTrustManager') compile project(':libs:MemorizingTrustManager')
compile 'com.android.support:support-v13:21.0.3' compile 'com.android.support:support-v13:23.0.0'
compile 'org.bouncycastle:bcprov-jdk15on:1.51' compile 'org.bouncycastle:bcprov-jdk15on:1.51'
compile 'org.jitsi:org.otr4j:0.22' compile 'org.jitsi:org.otr4j:0.22'
compile 'org.gnu.inet:libidn:1.15' compile 'org.gnu.inet:libidn:1.15'
@ -42,14 +42,15 @@ dependencies {
} }
android { android {
compileSdkVersion 22 compileSdkVersion 23
buildToolsVersion "22.0.1" buildToolsVersion "23.0.0"
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 21 targetSdkVersion 21
versionCode 87 versionCode 87
versionName "1.7.0-alpha" versionName "1.7.0-alpha"
project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName);
} }
compileOptions { compileOptions {
@ -89,8 +90,6 @@ android {
if (output.zipAlign != null) { if (output.zipAlign != null) {
output.zipAlign.outputFile = new File(output.outputFile.parent, rootProject.name + "-${variant.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"))
} }
} }
} }