From bd08b8aba35c2fce57dea37041a1629df769a0da Mon Sep 17 00:00:00 2001
From: Amine Bou <aminecmi@gmail.com>
Date: Mon, 4 Dec 2017 20:07:30 +0100
Subject: [PATCH] Build changes.

---
 CHANGELOG.md     |  6 ++++++
 app/build.gradle | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f1b4f3..8d5c0ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+**1.5.5.x**
+
+- Completed Dutch and Indonesian translation !
+
+- Changed versions handling.
+
 **1.5.4.22**
 
 - You can now scroll through the loaded articles !
diff --git a/app/build.gradle b/app/build.gradle
index b7a57e2..68b6ae4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,19 +8,27 @@ buildscript {
     }
 }
 
+ext {
+    configuration = [
+            buildDate: new Date()
+    ]
+}
+
 def gitVersion() {
     def process = "git describe --abbrev=0 --tags".execute()
-    return process.text.substring(1).replaceAll("\\.", "")
+    return process.text.substring(1).replaceAll("\\.", "").trim()
 }
 
 def versionCodeFromGit() {
-    println "version code " + gitVersion().toInteger()
-    return gitVersion().toInteger()
+    def versionCode = gitVersion() + (ext.configuration.buildDate.format("SSssmm")).toInteger()
+    println "version code " + versionCode
+    return versionCode.toInteger()
 }
 
 def versionNameFromGit() {
-    println "version code " + gitVersion().trim()
-    return gitVersion().trim()
+    def versionName = gitVersion() + ext.configuration.buildDate.format('yyyyMMddHHmm')
+    println "version name " + versionName
+    return versionName
 }
 
 apply plugin: 'org.sonarqube'