Update BuildVersion plugin

Author: asherepenko

CHANGELOG.md

@@ -1,4 +1,10 @@
-1.0.1
+1.0.3
+-----
+*2020-01-31*
+ - Update dependencies
+ - Update `BuildVersion` plugin
+
+1.0.2
 -----
 *2020-01-31*
  - Fix `Proguard` rules

buildSrc/src/main/kotlin/BuildVersion.kt

@@ -1,15 +1,8 @@
 import java.io.File
 import java.lang.IllegalArgumentException
 
-class BuildVersion(
-    private val major: Int = 1,
-    private val minor: Int = 0,
-    private val patch: Int = 0,
-    private val preRelease: String? = null,
-    private val buildMetadata: String? = null
-) {
+class BuildVersion(private val versionFile: File) {
     companion object {
-
         private val VERSION_PATTERN = Regex(
             """(0|[1-9]\d*)?(?:\.)?(0|[1-9]\d*)?(?:\.)?(0|[1-9]\d*)?(?:-([\dA-z\-]+(?:\.[\dA-z\-]+)*))?(?:\+([\dA-z\-]+(?:\.[\dA-z\-]+)*))?"""
         )
@@ -21,30 +14,33 @@ class BuildVersion(
         private val BUILD_METADATA_PATTERN = Regex(
             """[\dA-z\-]+(?:\.[\dA-z\-]+)*"""
         )
+    }
+
+    private var major: Int
+
+    private var minor: Int
 
-        @JvmStatic
-        fun parse(versionText: String): BuildVersion {
+    private var patch: Int
+
+    private var preRelease: String?
+
+    private var buildMetadata: String?
+
+    init {
+        if (versionFile.exists() && versionFile.canRead()) {
+            val versionText = versionFile.readText()
             val result = VERSION_PATTERN.matchEntire(versionText)
                 ?: throw IllegalArgumentException("Unable to parse build version: $versionText")
-            return BuildVersion(
-                major = result.groupValues[1].toInt(),
-                minor = result.groupValues[2].toInt(),
-                patch = result.groupValues[3].toInt(),
-                preRelease = if (result.groupValues[4].isEmpty()) null else result.groupValues[4],
-                buildMetadata = if (result.groupValues[5].isEmpty()) null else result.groupValues[5]
-            )
-        }
 
-        @JvmStatic
-        fun parse(versionFile: File): BuildVersion =
-            if (versionFile.exists() && versionFile.canRead()) {
-                parse(versionFile.readText())
-            } else {
-                throw IllegalArgumentException("Unable to read version file: ${versionFile.path}")
-            }
-    }
+            major = result.groupValues[1].toInt()
+            minor = result.groupValues[2].toInt()
+            patch = result.groupValues[3].toInt()
+            preRelease = if (result.groupValues[4].isEmpty()) null else result.groupValues[4]
+            buildMetadata = if (result.groupValues[5].isEmpty()) null else result.groupValues[5]
+        } else {
+            throw IllegalArgumentException("Unable to read version file: ${versionFile.path}")
+        }
 
-    init {
         require(major >= 0) { "Major version must be a positive number" }
         require(minor >= 0) { "Minor version must be a positive number" }
         require(patch >= 0) { "Patch version must be a positive number" }
@@ -55,21 +51,60 @@ class BuildVersion(
         }
 
         buildMetadata?.let {
-            require(buildMetadata.matches(BUILD_METADATA_PATTERN)) { "Build metadata is not valid" }
+            require(it.matches(BUILD_METADATA_PATTERN)) { "Build metadata is not valid" }
         }
     }
 
-    val versionCode: Int = major * 10000 + minor * 1000 + patch
+    val versionCode: Int
+        get() = major * 10000 + minor * 1000 + patch
 
-    val versionName: String = buildString {
-        append("$major.$minor.$patch")
+    val versionName: String
+        get() = buildString {
+            append("$major.$minor.$patch")
 
-        preRelease?.let {
-            append("-$it")
+            preRelease?.let {
+                append("-$it")
+            }
+
+            buildMetadata?.let {
+                append("+$it")
+            }
         }
 
-        buildMetadata?.let {
-            append("+$it")
+    // Trim pre-release and build metadata
+    fun prepareProdRelease() {
+        preRelease = null
+        buildMetadata = null
+    }
+
+    fun incrementMajor() {
+        major++
+        minor = 0
+        patch = 0
+
+        versionFile.writeText(versionName)
+    }
+
+    fun incrementMinor() {
+        minor++
+        patch = 0
+
+        if (minor >= 1000) {
+            major++
+            minor = 0
         }
+
+        versionFile.writeText(versionName)
+    }
+
+    fun incrementPatch() {
+        patch++
+
+        if (patch >= 1000) {
+            minor++
+            patch = 0
+        }
+
+        versionFile.writeText(versionName)
     }
 }

buildSrc/src/main/kotlin/IncrementVersion.kt

@@ -0,0 +1,46 @@
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.TaskAction
+
+enum class Increment {
+    MAJOR,
+    MINOR,
+    PATCH
+}
+
+abstract class IncrementVersion : DefaultTask() {
+    @get:Input
+    var prodRelease: Boolean = false
+
+    @get:Input
+    abstract var increment: Increment
+
+    @get:Input
+    abstract var version: BuildVersion
+
+    @TaskAction
+    fun increment() {
+        println("Incrementing ${increment.name} version...")
+
+        val prevVersionCode = version.versionCode
+        val prevVersionName = version.versionName
+
+        if (prodRelease) {
+            version.prepareProdRelease()
+        }
+
+        when (increment) {
+            Increment.MAJOR -> {
+                version.incrementMajor()
+            }
+            Increment.MINOR -> {
+                version.incrementMinor()
+            }
+            Increment.PATCH -> {
+                version.incrementPatch()
+            }
+        }
+
+        println("$prevVersionName ($prevVersionCode) -> ${version.versionName} (${version.versionCode})")
+    }
+}

logger/build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 }
 
 val archivesBaseName = "archivarius-logger"
-val buildVersion = BuildVersion.parse(rootProject.file("version"))
+val buildVersion = BuildVersion(rootProject.file("version"))
 
 group = "com.github.asherepenko"
 version = buildVersion.versionName
@@ -70,14 +70,14 @@ ktlint {
     }
 }
 
-val archivariusVersion = "1.0.4"
-val loggerVersion = "1.0.2"
+val archivariusVersion = "1.0.5"
+val loggerVersion = "1.0.3"
 
 dependencies {
     api("com.github.asherepenko:android-archivarius:$archivariusVersion")
     api("com.github.asherepenko:android-logger:$loggerVersion")
     implementation(kotlin("stdlib-jdk8", KotlinCompilerVersion.VERSION))
-    testImplementation("junit:junit:4.12")
+    testImplementation("junit:junit:4.13")
     testImplementation("androidx.test:core:1.2.0")
     testImplementation("androidx.test:runner:1.2.0")
     testImplementation("androidx.test.ext:junit:1.1.1")
@@ -108,6 +108,21 @@ tasks {
         from(android.sourceSets.getByName("main").java.srcDirs)
     }
 
+    val incrementMajor by registering(IncrementVersion::class) {
+        increment = Increment.MAJOR
+        version = buildVersion
+    }
+
+    val incrementMinor by registering(IncrementVersion::class) {
+        increment = Increment.MINOR
+        version = buildVersion
+    }
+
+    val incrementPatch by registering(IncrementVersion::class) {
+        increment = Increment.PATCH
+        version = buildVersion
+    }
+
     artifacts {
         archives(javadocJar)
         archives(sourcesJar)

version

@@ -1 +1 @@
-1.0.2
+1.0.3