too much stuff here, it is no longer 1.6, it is 1.7

3 files changed, 22 insertions, 12 deletions

diff --git a/build.gradle b/build.gradle
index d7c2674ab..f3fff2847 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,7 @@
-import com.android.build.OutputFile;
-import localproperties.LocalPropertiesFile;
+import com.android.build.OutputFile
+import localproperties.LocalPropertiesFile
+import versionbuilder.VersionBuilder
+
 
 ext.androidBuildTools = '23.0.2'
 ext.supportLibVersion = '23.1.1'
@@ -28,7 +30,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'pmd'
 apply plugin: 'jacoco'
 
-version versionbuilder.VersionBuilder.buildGitVersionName()
+version VersionBuilder.buildGitVersionName()
 group 'net.evendanan'
 
 println "Building AnySoftKeyboard "+version
@@ -62,7 +64,7 @@ android {
 
     defaultConfig {
         applicationId 'com.menny.android.anysoftkeyboard'
-        versionCode versionbuilder.VersionBuilder.buildGitVersionNumber()
+        versionCode VersionBuilder.buildGitVersionNumber()
         versionName project.version
 
         minSdkVersion sdkMinimumVersion
diff --git a/buildSrc/src/main/groovy/versionbuilder/VersionBuilder.groovy b/buildSrc/src/main/groovy/versionbuilder/VersionBuilder.groovy
index ce8130aca..8fcdfb25f 100644
--- a/buildSrc/src/main/groovy/versionbuilder/VersionBuilder.groovy
+++ b/buildSrc/src/main/groovy/versionbuilder/VersionBuilder.groovy
@@ -1,15 +1,22 @@
 package versionbuilder
 
-class VersionBuilder {
-    static final int GIT_COMMIT_COUNT_NORMALIZE = 2320;
-    static final int GIT_COMMIT_COUNT_MINOR_NORMALIZE = 140+50+38;
+public class VersionBuilder {
+    static final int GIT_COMMIT_COUNT_NORMALIZE = 2320
+    static final int GIT_COMMIT_COUNT_MINOR_NORMALIZE = 140+50+38+167
 
-    static def buildGitVersionNumber() {
-        return Integer.parseInt('git rev-list --count HEAD'.execute().text.trim()) - GIT_COMMIT_COUNT_NORMALIZE;
+    public static def buildGitVersionNumber() {
+        try {
+            return Integer.parseInt('git rev-list --count HEAD'.execute().text.trim()) - GIT_COMMIT_COUNT_NORMALIZE
+        } catch (Exception e) {
+            println("Failed to get version from git data. Error: "+e.message);
+            return 1
+        }
     }
 
-    static def buildGitVersionName() {
-        return String.format("%d.%d.%d", 1, 6, buildGitVersionNumber() - GIT_COMMIT_COUNT_MINOR_NORMALIZE);
+    public static def buildGitVersionName() {
+        int gitVersion = buildGitVersionNumber()
+        if (gitVersion < GIT_COMMIT_COUNT_MINOR_NORMALIZE) gitVersion = GIT_COMMIT_COUNT_MINOR_NORMALIZE + 1
+        return String.format("%d.%d.%d", 1, 7, gitVersion - GIT_COMMIT_COUNT_MINOR_NORMALIZE)
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/anysoftkeyboard/ui/tutorials/VersionChangeLogs.java b/src/main/java/com/anysoftkeyboard/ui/tutorials/VersionChangeLogs.java
index e55338925..36335b1ba 100644
--- a/src/main/java/com/anysoftkeyboard/ui/tutorials/VersionChangeLogs.java
+++ b/src/main/java/com/anysoftkeyboard/ui/tutorials/VersionChangeLogs.java
@@ -11,9 +11,10 @@ public class VersionChangeLogs {
     static List<VersionChangeLog> createChangeLog() {
         List<VersionChangeLog> log = new ArrayList<>();
 
-        log.add(new VersionChangeLog(1, 6, "r4", Uri.parse("https://github.com/AnySoftKeyboard/AnySoftKeyboard/milestones/1.6-r4"),
+        log.add(new VersionChangeLog(1, 7, "", Uri.parse("https://github.com/AnySoftKeyboard/AnySoftKeyboard/milestones/1.7"),
                 "Printing-out speed ups. This is very helpful to you 150-words-a-minute wizards.",
                 "Physical-Keyboard interaction enhancements. This has Wife-Seal-of-Approval stamp on it.",
+                "Automatically switch to previously used layout in an App. Probably good for multilingual users.",
                 "Localization update: PL, CA, MY, UK, DE.",
                 "YABTU"));