Using a generic auto-versioning plugin

3 files changed, 16 insertions, 27 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 52fb46873..c53a3816d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,40 +1,17 @@
 group 'net.evendanan'
 
-buildscript {
-    repositories {
-        google()
-        maven { url 'https://plugins.gradle.org/m2/' }
-        mavenCentral()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'net.evendanan.autoversion:gradle-plugin:0.1.7'
-    }
-}
-
 apply plugin: 'com.android.application'
 apply plugin: 'com.github.triplet.play'
-apply plugin: 'net.evendanan.autoversion'
-
-def generators = [
-        new net.evendanan.versiongenerator.generators.EnvBuildVersionGenerator.CircleCi(
-                1650/*adding to version. Should never change*/,
-                -2575-2600 /*decrementing due to minor, every minor/major bump, this should be decremented*/),
-        new net.evendanan.versiongenerator.generators.StaticVersionGenerator()
-]
-
-def versionData = versionGenerator.generateVersion(1, 10, 0, generators)
 
 apply from: "${rootDir}/gradle/android_general.gradle"
 
 android {
     defaultConfig {
         applicationId 'com.menny.android.anysoftkeyboard'
-        versionCode versionData.versionCode
-        versionName versionData.versionName
+        versionCode rootProject.autoVersioning.versionData.versionCode
+        versionName rootProject.autoVersioning.versionData.versionName
 
-        println "Building AnySoftKeyboard ${versionData.versionName} (or ${project.version}), code ${versionData.versionCode}."
+        println "Building AnySoftKeyboard ${versionName} (or ${project.version}), code ${versionCode}."
 
         //adding additional fields to the BuildConfig class.
         String support_email_address = System.getenv("ANYSOFTKEYBOARD_CRASH_REPORT_EMAIL")
diff --git a/build.gradle b/build.gradle
index f06fd3a0e..d99b620f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,9 +15,21 @@ buildscript {
         classpath 'com.github.triplet.gradle:play-publisher:2.4.2'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.8.1'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.8'
+        classpath 'net.evendanan.autoversion:gradle-plugin:0.1.20'
     }
 }
 
+apply plugin: 'net.evendanan.autoversion.simple'
+
+autoVersioning {
+    enabled = rootProject.hasProperty("withAutoVersioning")
+    buildCounterEnvKey = "CIRCLE_BUILD_NUM"
+    major = 1
+    minor = 10
+    buildCounterOffset = 1650 /*adding to version. Should never change*/
+    patchOffset = -2575-2600 /*decrementing due to minor, every minor/major bump, this should be decremented*/
+}
+
 apply plugin: 'com.github.sherter.google-java-format'
 
 googleJavaFormat {
diff --git a/scripts/ci/ci_deploy.sh b/scripts/ci/ci_deploy.sh
index 91de40055..7f584a677 100755
--- a/scripts/ci/ci_deploy.sh
+++ b/scripts/ci/ci_deploy.sh
@@ -40,4 +40,4 @@ fi
 echo "Downloading signature files..."
 wget ${KEYSTORE_FILE_URL} -q -O /tmp/anysoftkeyboard.keystore
 wget ${PUBLISH_CERT_FILE_URL} -q -O /tmp/apk_upload_key.p12
-./gradlew --stacktrace ${BUILD_TYPE}
+./gradlew --stacktrace -PwithAutoVersioning ${BUILD_TYPE}