From 868d9f890cd6c0da9d2fcbc030fb099db6585f55 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Sat, 22 Nov 2014 19:53:37 +0100
Subject: [PATCH 1/3] update android gradle plugin to 0.14.4

to work with AS >= 0.9.0 plugin >= 0.14.0 is required
also update gradle to 2.2.
---
 build.gradle                             | 21 ++++++++-------------
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 libs/minidns/build.gradle                |  7 +++++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 876cdf0aa..23aafae7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:0.12.2'
+		classpath 'com.android.tools.build:gradle:0.14.4'
 	}
 }
 
@@ -81,18 +81,13 @@ android {
 		buildTypes.release.signingConfig = null
 	}
 
-	buildTypes {
-		applicationVariants.all { variant ->
-			def fileName = variant.packageApplication.outputFile.name.replace(".apk",
-					"-" + defaultConfig.versionName + ".apk")
-				variant.packageApplication.outputFile = new
-				File(variant.packageApplication.outputFile.parent, fileName)
-				if (variant.zipAlign) {
-					if (variant.name.equals('release')) {
-						variant.outputFile = new File(variant.outputFile.parent,
-								rootProject.name + "-" + defaultConfig.versionName + ".apk")
-					}
-				}
+	applicationVariants.all { variant ->
+		if (variant.name.equals('release')) {
+			variant.outputs.each { output ->
+				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"))
+			}
 		}
 	}
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1e61d1fd3..c35d59671 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Sat Nov 22 17:47:57 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
diff --git a/libs/minidns/build.gradle b/libs/minidns/build.gradle
index 5941beaf7..c9b93467e 100644
--- a/libs/minidns/build.gradle
+++ b/libs/minidns/build.gradle
@@ -19,7 +19,10 @@ group = 'de.measite.minidns'
 description = "A minimal DNS client library with support for A, AAAA, NS and SRV records"
 sourceCompatibility = 1.7
 version = 'git tag --points-at HEAD'.execute().text.trim()
-isSNAPSHOT = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() == 'master'
+
+ext {
+	isSNAPSHOT = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() == 'master'
+}
 
 if (isSNAPSHOT) {
   version = version + '-SNAPSHOT'
@@ -74,4 +77,4 @@ modifyPom {
 }
 
 dependencies {
-}
\ No newline at end of file
+}

From c36d564b6999aa80ffffb9d94468a2d9b0ce0d21 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Fri, 5 Dec 2014 23:26:58 +0100
Subject: [PATCH 2/3] update android gradle plugin to 1.0.0-rc4

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 23aafae7f..6718e140b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:0.14.4'
+		classpath 'com.android.tools.build:gradle:1.0.0-rc4'
 	}
 }
 

From 0193cdb194b76acbc75742e46d186e5bc4a0b159 Mon Sep 17 00:00:00 2001
From: Michael <betheg@bitcloner.org>
Date: Tue, 9 Dec 2014 11:12:33 +0100
Subject: [PATCH 3/3] update gradle to 2.2.1 and android gradle plugin to 1.0.0

---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6718e140b..49d439d0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:1.0.0-rc4'
+		classpath 'com.android.tools.build:gradle:1.0.0'
 	}
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c35d59671..81cfe7fe8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip