Update Composite builds and add Release plugin

app/build.gradle

@@ -3,6 +3,7 @@ plugins {
   id "com.github.triplet.play" version "3.0.0"
   id "com.jraska.github.client.firebase"
   id 'com.jraska.gradle.buildtime'
+  id 'com.jraska.github.client.release'
 }
 
 apply plugin: 'com.android.application'

plugins/build.gradle

@@ -3,7 +3,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
   }
 }
 
@@ -16,8 +16,11 @@ repositories {
 
 dependencies {
   implementation gradleApi()
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10"
   implementation 'com.mixpanel:mixpanel-java:1.4.4'
+
+  testImplementation 'junit:junit:4.13.1'
+  testImplementation 'org.assertj:assertj-core:3.17.2'
 }
 
 compileKotlin {
@@ -41,5 +44,9 @@ gradlePlugin {
       id = 'com.jraska.gradle.buildtime'
       implementationClass = 'com.jraska.gradle.buildtime.BuildTimePlugin'
     }
+    releasePlugin {
+      id = 'com.jraska.github.client.release'
+      implementationClass = 'com.jraska.github.client.release.ReleasePlugin'
+    }
   }
 }

plugins/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

plugins/src/main/java/com/jraska/github/client/release/GradleFileVersionIncrement.kt

@@ -0,0 +1,35 @@
+package com.jraska.github.client.release
+
+import java.util.regex.Pattern
+
+object GradleFileVersionIncrement {
+  fun incrementVersionCode(gradleFileText: String): String {
+    val versionCodePattern = Pattern.compile("""versionCode ([0-9]*)""")
+    val versionCodeMatcher = versionCodePattern.matcher(gradleFileText)
+    val found = versionCodeMatcher.find()
+    if (!found) {
+      throw IllegalStateException("No match found for $versionCodePattern")
+    }
+
+    val oldVersionCode = versionCodeMatcher.group(1).toLong()
+    val newVersionCode = oldVersionCode + 1
+
+    return gradleFileText.replace(versionCodeMatcher.group(0), "versionCode $newVersionCode")
+  }
+
+  fun incrementVersionNamePatch(gradleFileText: String): String {
+    val versionNamePattern = Pattern.compile("""versionName '([0-9]*)\.([0-9]*)\.([0-9]*)'""")
+    val versionNameMatcher = versionNamePattern.matcher(gradleFileText)
+    val found = versionNameMatcher.find()
+    if (!found) {
+      throw IllegalStateException("No match found for $versionNamePattern")
+    }
+
+    val oldPatch = versionNameMatcher.group(3).toLong()
+    val newPatch = oldPatch + 1
+
+    val newText = "versionName '${versionNameMatcher.group(1)}.${versionNameMatcher.group(2)}.$newPatch'"
+
+    return gradleFileText.replace(versionNameMatcher.group(0), newText)
+  }
+}

plugins/src/main/java/com/jraska/github/client/release/ReleasePlugin.kt

@@ -0,0 +1,31 @@
+package com.jraska.github.client.release
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import java.io.File
+
+class ReleasePlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    project.afterEvaluate {
+      addTasks(it)
+    }
+  }
+
+  private fun addTasks(project: Project) {
+    project.tasks.register("incrementPatch") {
+      it.doFirst {
+        updatePatchVersionInBuildGradle(project)
+      }
+    }
+  }
+
+  private fun updatePatchVersionInBuildGradle(project: Project) {
+    val buildGradleFile = File(project.projectDir, "build.gradle")
+    val buildGradleText = buildGradleFile.readText()
+
+    val incrementVersionCode = GradleFileVersionIncrement.incrementVersionCode(buildGradleText)
+    val newContent = GradleFileVersionIncrement.incrementVersionNamePatch(incrementVersionCode)
+
+    buildGradleFile.writeText(newContent)
+  }
+}

plugins/src/test/kotlin/com/jraska/github/client/release/VersionIncrementTest.kt

@@ -0,0 +1,54 @@
+package com.jraska.github.client.release
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+
+class VersionIncrementTest {
+  val GRADLE_FILE_TEXT = """android {
+  compileSdkVersion 30
+
+  defaultConfig {
+    applicationId "com.jraska.github.client"
+    minSdkVersion 21
+    targetSdkVersion 30
+    versionName '0.20.9'
+    versionCode 66
+    multiDexEnabled true
+
+    testInstrumentationRunner "com.jraska.github.client.TestRunner"
+  }
+
+  adbOptions {
+    installOptions "-g"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+}"""
+
+  @Test
+  fun versionCodeIsIncremented() {
+    val incrementedContent = GradleFileVersionIncrement.incrementVersionCode(GRADLE_FILE_TEXT)
+    assertThat(incrementedContent).contains("versionCode 67")
+    assertThat(incrementedContent.length).isEqualTo(GRADLE_FILE_TEXT.length)
+
+    val anotherIncrementedContent = GradleFileVersionIncrement.incrementVersionCode(incrementedContent)
+    assertThat(anotherIncrementedContent).contains("versionCode 68")
+    assertThat(incrementedContent.length).isEqualTo(GRADLE_FILE_TEXT.length)
+  }
+
+  @Test
+  fun patchIsIncremented() {
+    val incrementedContent = GradleFileVersionIncrement.incrementVersionNamePatch(GRADLE_FILE_TEXT)
+    assertThat(incrementedContent).contains("versionName '0.20.10'")
+    assertThat(incrementedContent.length).isEqualTo(GRADLE_FILE_TEXT.length + 1)
+
+    val anotherIncrementedContent = GradleFileVersionIncrement.incrementVersionNamePatch(incrementedContent)
+    assertThat(anotherIncrementedContent).contains("versionName '0.20.11'")
+    assertThat(incrementedContent.length).isEqualTo(GRADLE_FILE_TEXT.length + 1)
+  }
+}