sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'betheg-sdk_version' into development

This commit is contained in:
Daniel Gultsch 2015-08-24 22:21:24 +02:00
parent 3da90638c6 120810b9ca
commit 4f87413b16
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -3,8 +3,9 @@ android:
components: components:
- platform-tools - platform-tools
- tools - tools
- build-tools-23.0.0
- build-tools-22.0.1 - build-tools-22.0.1
- build-tools-21.1.2 - build-tools-21.1.2
- build-tools-19.1.0 - build-tools-19.1.0
- android-22 - android-23
- extra-android-m2repository - extra-android-m2repository

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 88 versionCode 88
versionName "1.7.0-beta" versionName "1.7.0-beta"
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"))
} }
} }
} }