From 5f0ed62833c412f4d9ac0a0b3d168fa9a0cc8405 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Mon, 24 Aug 2015 10:59:52 +0200
Subject: [PATCH 1/3] update android sdk and support library.

make use of the archivesBaseName and
rename only 'zipaligned' release build.
---
 build.gradle | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index a434faabc..725791cd5 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 87
 		versionName "1.7.0-alpha"
+		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"))
 			}
 		}
 	}

From 4cc48f01df004af8060061b87bbfe49bb258edf6 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Mon, 24 Aug 2015 11:26:17 +0200
Subject: [PATCH 2/3] update travis.yml

---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a2959e0a2..07f187fa8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,6 @@ android:
   components:
     - platform-tools
     - tools
-    - build-tools-22.0.1
-    - build-tools-21.1.2
-    - build-tools-19.1.0
-    - android-22
+    - build-tools-23.0.0
+    - android-23
     - extra-android-m2repository

From 97c28b13a644ddd7fa1b71fde2fa9f42d7de868d Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Mon, 24 Aug 2015 11:32:21 +0200
Subject: [PATCH 3/3] add the the previously deleted build-tools.

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 07f187fa8..7c1c68441 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,8 @@ android:
     - platform-tools
     - tools
     - build-tools-23.0.0
+    - build-tools-22.0.1
+    - build-tools-21.1.2
+    - build-tools-19.1.0
     - android-23
     - extra-android-m2repository