From 7554ab9a02d48cb77d45e1496fb0797b1083109d Mon Sep 17 00:00:00 2001
From: Aleksei Kliuev <alex.v.kluev@gmail.com>
Date: Mon, 11 Sep 2017 14:23:28 +0300
Subject: [PATCH] revert gradle

---
 client/Android/Studio/.gitignore               | 10 +++-------
 client/Android/Studio/aFreeRDP/build.gradle    | 22 ++++++++++++++++------
 client/Android/Studio/build.gradle             | 25 +++++++++++++++++++++++--
 client/Android/Studio/freeRDPCore/build.gradle | 12 ++++++------
 4 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/client/Android/Studio/.gitignore b/client/Android/Studio/.gitignore
index f15db27..a2dc231 100644
--- a/client/Android/Studio/.gitignore
+++ b/client/Android/Studio/.gitignore
@@ -29,13 +29,9 @@ Thumbs.db
 *.iml
 .idea
 #.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
-/.gradle
-/.idea/
-/local.properties
-build
-*.iml
+.gradle
+build/
 
 #NDK
 obj/
-
-
+jniLibs/
diff --git a/client/Android/Studio/aFreeRDP/build.gradle b/client/Android/Studio/aFreeRDP/build.gradle
index 1b44f7f..62347de 100644
--- a/client/Android/Studio/aFreeRDP/build.gradle
+++ b/client/Android/Studio/aFreeRDP/build.gradle
@@ -1,22 +1,32 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion = rootProject.ext.compileSdk
+    buildToolsVersion = rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "com.freerdp.afreerdp"
-        minSdkVersion 20
-        targetSdkVersion 25
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
         vectorDrawables.useSupportLibrary = true
-        versionCode 1
-        versionName "1"
+        versionCode = rootProject.ext.versionCode
+        versionName = rootProject.ext.versionName
     }
 
+    signingConfigs {
+        release {
+            storeFile file(RELEASE_STORE_FILE)
+            storePassword RELEASE_STORE_PASSWORD
+            keyAlias RELEASE_KEY_ALIAS
+            keyPassword RELEASE_KEY_PASSWORD
+            storeType "jks"
+        }
+    }
 
     buildTypes {
         release {
             minifyEnabled false
+            signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
         debug {
diff --git a/client/Android/Studio/build.gradle b/client/Android/Studio/build.gradle
index 37e8774..01d2fab 100644
--- a/client/Android/Studio/build.gradle
+++ b/client/Android/Studio/build.gradle
@@ -7,18 +7,39 @@ if (file.canRead()) {
 
 def getVersionName = { ->
     def stdout = new ByteArrayOutputStream()
-
+    exec {
+        commandLine 'git', 'describe', '--tags'
+        standardOutput = stdout
+    }
     return stdout.toString().trim()
 }
 
+ext {
+    versionCode = properties.get('VERSION', "10").toInteger()
+    minSdk = properties.get('MIN_SDK', "14").toInteger()
+    targetSdk = properties.get('TARGET_SDK', "25").toInteger()
+    compileSdk = properties.get('COMPILE_SDK', "25").toInteger()
+    buildToolsVersion = properties.get('BUILD_TOOLS', "25.0.2")
+    versionName = properties.get('VERSION_NAME', getVersionName())
 
+    println '----------------- Project configuration -------------------'
+    println 'VERSION:            ' + versionCode
+    println 'MIN_SDK:            ' + minSdk
+    println 'TARGET_SDK:         ' + targetSdk
+    println 'COMPILE_SDK:        ' + compileSdk
+    println 'BUILD_TOOLS:        ' + buildToolsVersion
+    println 'VERSION_NAME:       ' + versionName
+    println 'RELEASE_STORE_FILE: '+ RELEASE_STORE_FILE
+    println 'RELEASE_KEY_ALIAS:  '+ RELEASE_KEY_ALIAS
+    println '-----------------------------------------------------------'
+}
 
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.0'
     }
 }
 
diff --git a/client/Android/Studio/freeRDPCore/build.gradle b/client/Android/Studio/freeRDPCore/build.gradle
index a147478..1f66bac 100644
--- a/client/Android/Studio/freeRDPCore/build.gradle
+++ b/client/Android/Studio/freeRDPCore/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion = rootProject.ext.compileSdk
+    buildToolsVersion = rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 20
-        targetSdkVersion 25
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
         vectorDrawables.useSupportLibrary = true
-        versionCode 1
-        versionName "1"
+        versionCode = rootProject.ext.versionCode
+        versionName = rootProject.ext.versionName
     }
 
     buildTypes {
-- 
2.7.4