From 97b01d50d4fc54061ff8495e92217f31454acd0a Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Thu, 14 Apr 2016 21:44:38 +0200
Subject: [PATCH] Update Gradle

---
 extern/MicroGUiTools                     |  2 +-
 extern/UnifiedNlpApi                     |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 unifiednlp-app/build.gradle              | 12 ++++++------
 unifiednlp-base/build.gradle             | 12 ++++++------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/extern/MicroGUiTools b/extern/MicroGUiTools
index 1e8926e..e73d7fa 160000
--- a/extern/MicroGUiTools
+++ b/extern/MicroGUiTools
@@ -1 +1 @@
-Subproject commit 1e8926edd95dc155d57c1306d7b13448cd895740
+Subproject commit e73d7fae9a613fff8f3f7b0f2f03011b751b30a4
diff --git a/extern/UnifiedNlpApi b/extern/UnifiedNlpApi
index 2cfb3dd..c672922 160000
--- a/extern/UnifiedNlpApi
+++ b/extern/UnifiedNlpApi
@@ -1 +1 @@
-Subproject commit 2cfb3ddde2754a78671d4152eab6b6c2b6614b55
+Subproject commit c672922087c47e2c226f842766fd4b8eb44eced5
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 03cfe79..aa76e3e 100755
--- 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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
diff --git a/unifiednlp-app/build.gradle b/unifiednlp-app/build.gradle
index 3b62ea0..20b74e6 100644
--- a/unifiednlp-app/build.gradle
+++ b/unifiednlp-app/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
     }
 }
 
@@ -27,11 +27,11 @@ apply plugin: 'com.android.application'
 
 String getMyVersionName() {
     def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'describe', '--tags', '--always', '--dirty'
-        standardOutput = stdout
-    }
-    return stdout.toString().trim()
+    if (rootProject.file("gradlew").exists())
+        exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout }
+    else // automatic build system, don't tag dirty
+        exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout }
+    return stdout.toString().trim().substring(1)
 }
 
 int getMyVersionCode() {
diff --git a/unifiednlp-base/build.gradle b/unifiednlp-base/build.gradle
index c9c875e..c83e626 100644
--- a/unifiednlp-base/build.gradle
+++ b/unifiednlp-base/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
     }
 }
 
@@ -27,11 +27,11 @@ apply plugin: 'com.android.library'
 
 String getMyVersionName() {
     def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'describe', '--tags', '--always', '--dirty'
-        standardOutput = stdout
-    }
-    return stdout.toString().trim()
+    if (rootProject.file("gradlew").exists())
+        exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout }
+    else // automatic build system, don't tag dirty
+        exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout }
+    return stdout.toString().trim().substring(1)
 }
 
 android {