Merge branch 'betheg-sdk_version' into development

.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

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"))
 			}
 		}
 	}