diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-08-24 22:21:24 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-08-24 22:21:24 +0200 |
| commit | 4f87413b16362c7701708c96a78a4ec4bd51e508 (patch) | |
| tree | efac522b5f72fc43c78cf357bbc6cc2220e19e01 | |
| parent | 3da90638c63b770d7f5011a381ae8c2486726c11 (diff) | |
| parent | 120810b9ca91118836ef0f21d6dda34652749790 (diff) | |
Merge branch 'betheg-sdk_version' into development
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | build.gradle | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index a2959e0a..7c1c6844 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,9 @@ android: components: - platform-tools - tools + - build-tools-23.0.0 - build-tools-22.0.1 - build-tools-21.1.2 - build-tools-19.1.0 - - android-22 + - android-23 - extra-android-m2repository diff --git a/build.gradle b/build.gradle index b347db45..d556d41e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } 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 { compile project(':libs:openpgp-api-lib') 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.jitsi:org.otr4j:0.22' compile 'org.gnu.inet:libidn:1.15' @@ -42,14 +42,15 @@ dependencies { } android { - compileSdkVersion 22 - buildToolsVersion "22.0.1" + compileSdkVersion 23 + buildToolsVersion "23.0.0" defaultConfig { minSdkVersion 14 targetSdkVersion 21 versionCode 88 versionName "1.7.0-beta" + project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName); } compileOptions { @@ -89,8 +90,6 @@ android { if (output.zipAlign != null) { 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")) } } } |