Merge dev

10 files changed, 232 insertions, 122 deletions

diff --git a/buildSrc/src/main/groovy/ca/allanwang/kau/ChangelogGenerator.groovy b/buildSrc/src/main/groovy/ca/allanwang/kau/ChangelogGenerator.groovy
deleted file mode 100644
index bb56fa2..0000000
--- a/buildSrc/src/main/groovy/ca/allanwang/kau/ChangelogGenerator.groovy
+++ /dev/null
@@ -1,76 +0,0 @@
-package ca.allanwang.kau
-
-import org.gradle.api.GradleException
-import org.gradle.api.Project
-
-/**
- * Given an xml of the format
- *
- * <?xml version="1.0" encoding="utf-8"?>
- *  <resources>
- *  <version title="v0.1" />
- *  <item text="Initial Changelog" />
- *  <item text="Bullet point here" />
- *  <item text="More points" />
- *  <item text="" /> <!-- this one is empty and therefore ignored -->
- * </resources>
- *
- * Outputs a changelog in markdown format
- */
-class ChangelogGenerator {
-
-    static class ChangelogException extends GradleException {
-        ChangelogException(String message) {
-            super(message)
-        }
-    }
-
-    private Project project
-
-    ChangelogGenerator(Project project) {
-        this.project = project
-    }
-
-    private static void fail(String message) {
-        throw new ChangelogException(message)
-    }
-
-    final void generate(String inputUri, String outputUri = "$project.rootDir/docs/Changelog.md") {
-        def input = new File(inputUri)
-        if (!input.exists())
-            fail("Could not generate changelog from ${input.absolutePath}")
-
-        def output = new File(outputUri)
-
-        if (output.exists()) {
-            if (output.isDirectory())
-                fail("Cannot save changelog at directory ${output.absolutePath}")
-
-
-            if (output.isFile() && !output.delete())
-                fail("Could not delete changelog at ${output.absolutePath}")
-        } else {
-            output.parentFile.mkdirs()
-        }
-
-        if (!output.createNewFile())
-            fail("Could not create changelog file at ${output.absolutePath}")
-
-        def parsedProjectXml = (new XmlParser()).parse(inputUri)
-        def sw = new StringWriter()
-        sw.append("# Changelog\n")
-        parsedProjectXml.depthFirst().each {
-            switch (it.name()) {
-                case "version":
-                    sw.append("\n## ${it.@title}\n")
-                    break
-                case "item":
-                    if (it.@text?.trim())
-                        sw.append("* ${it.@text}\n")
-            }
-        }
-        output.write(sw.toString())
-        println("Generated changelog at ${output.absolutePath}")
-    }
-
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/ca/allanwang/kau/Dependencies.groovy b/buildSrc/src/main/groovy/ca/allanwang/kau/Dependencies.groovy
deleted file mode 100644
index ec3d208..0000000
--- a/buildSrc/src/main/groovy/ca/allanwang/kau/Dependencies.groovy
+++ /dev/null
@@ -1,12 +0,0 @@
-package ca.allanwang.kau
-
-/**
- * Some common dependencies, backed by the supplied versions
- */
-class Dependencies {
-    static def kotlin = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
-    static def kotlinTest = "org.jetbrains.kotlin:kotlin-test-junit:${Versions.kotlin}"
-    static def junit = "junit:junit:${Versions.junit}"
-    static def espresso = "com.android.support.test.espresso:espresso-core:${Versions.espresso}"
-    static def testRunner = "com.android.support.test:runner:${Versions.testRunner}"
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/ca/allanwang/kau/KauPlugin.groovy b/buildSrc/src/main/groovy/ca/allanwang/kau/KauPlugin.groovy
deleted file mode 100644
index e73564c..0000000
--- a/buildSrc/src/main/groovy/ca/allanwang/kau/KauPlugin.groovy
+++ /dev/null
@@ -1,16 +0,0 @@
-package ca.allanwang.kau
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-class KauPlugin implements Plugin<Project> {
-
-    @Override
-    void apply(Project project) {
-        project.extensions.create("kau", Versions)
-        project.extensions.create("kauPlugin", Plugins)
-        project.extensions.create("kauDependency", Dependencies)
-        project.extensions.create("kauChangelog", ChangelogGenerator, project)
-    }
-
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/ca/allanwang/kau/Plugins.groovy b/buildSrc/src/main/groovy/ca/allanwang/kau/Plugins.groovy
deleted file mode 100644
index c1ecba6..0000000
--- a/buildSrc/src/main/groovy/ca/allanwang/kau/Plugins.groovy
+++ /dev/null
@@ -1,17 +0,0 @@
-package ca.allanwang.kau
-
-/**
- * Some common buildscript plugins, backed by the supplied versions
- */
-class Plugins {
-    static def android = "com.android.tools.build:gradle:${Versions.gradlePlugin}"
-    static def kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
-    static
-    def androidMaven = "com.github.dcendents:android-maven-gradle-plugin:${Versions.mavenPlugin}"
-    static
-    def playPublisher = "com.github.triplet.gradle:play-publisher:${Versions.playPublishPlugin}"
-    static
-    def dexCount = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${Versions.dexCountPlugin}"
-    static
-    def gitVersion = "gradle.plugin.com.gladed.gradle.androidgitversion:gradle-android-git-version:${Versions.gitVersionPlugin}"
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/ca/allanwang/kau/ChangelogGenerator.kt b/buildSrc/src/main/kotlin/ca/allanwang/kau/ChangelogGenerator.kt
new file mode 100644
index 0000000..5e21b7e
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ca/allanwang/kau/ChangelogGenerator.kt
@@ -0,0 +1,105 @@
+package ca.allanwang.kau
+
+import groovy.util.Node
+import groovy.util.XmlParser
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+import java.io.File
+
+/**
+ * Given an xml of the format
+ *
+ * <?xml version="1.0" encoding="utf-8"?>
+ *  <resources>
+ *  <version title="v0.1" />
+ *  <item text="Initial Changelog" />
+ *  <item text="Bullet point here" />
+ *  <item text="More points" />
+ *  <item text="" /> <!-- this one is empty and therefore ignored -->
+ * </resources>
+ *
+ * Outputs a changelog in markdown format
+ */
+open class ChangelogGenerator(private val project: Project) {
+
+    class ChangelogException(message: String) : GradleException(message)
+
+    private fun fail(message: String): Nothing =
+        throw ChangelogException(message)
+
+    class ChangelogEntry(val version: String, val items: Array<String>)
+
+    private fun Node.forEachNode(action: (Node) -> Unit) {
+        children().forEach {
+            action(it as Node)
+        }
+    }
+
+    fun read(inputUri: String): List<ChangelogEntry> {
+        val input = File(inputUri)
+        if (!input.exists()) {
+            fail("Could not generate changelog from ${input.absolutePath}")
+        }
+
+        val parser = XmlParser().parse(inputUri)
+
+        val entries: MutableList<ChangelogEntry> = mutableListOf()
+        var version: String? = null
+        val items: MutableList<String> = mutableListOf()
+
+        fun addEntry() {
+            version?.also { v ->
+                entries.add(ChangelogEntry(v, items.toTypedArray()))
+                items.clear()
+            }
+        }
+
+        parser.depthFirst().mapNotNull { it as? Node }.forEach { n ->
+            when (n.name()) {
+                "version" -> {
+                    addEntry()
+                    version = n.attribute("title")?.toString() ?: ""
+                }
+                "item" -> {
+                    n.attribute("text")?.toString()?.takeIf(String::isNotBlank)?.let {
+                        items.add(it)
+                    }
+                }
+            }
+        }
+        addEntry()
+        return entries
+    }
+
+    @JvmOverloads
+    fun generate(inputUri: String, outputUri: String = "${project.rootDir}/docs/Changelog.md"): List<ChangelogEntry> {
+        val entries = read(inputUri)
+        val output = File(outputUri)
+        if (output.exists()) {
+            if (output.isDirectory) {
+                fail("Cannot save changelog at directory ${output.absolutePath}")
+            }
+            if (output.isFile && !output.delete()) {
+                fail("Could not delete changelog at ${output.absolutePath}")
+            }
+        } else {
+            output.parentFile.mkdirs()
+        }
+
+        if (!output.createNewFile()) {
+            fail("Could not create changelog file at ${output.absolutePath}")
+        }
+        val markdown = buildString {
+            append("# Changelog\n")
+            entries.forEach { e ->
+                append("\n## ${e.version}\n")
+                e.items.forEach {
+                    append("* $it\n")
+                }
+            }
+        }
+        output.writeText(markdown)
+        println("Generated changelog at ${output.absolutePath}")
+        return entries
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/ca/allanwang/kau/Dependencies.kt b/buildSrc/src/main/kotlin/ca/allanwang/kau/Dependencies.kt
new file mode 100644
index 0000000..9e23ac4
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ca/allanwang/kau/Dependencies.kt
@@ -0,0 +1,14 @@
+package ca.allanwang.kau
+
+/**
+ * Some common dependencies, backed by the supplied versions
+ */
+open class Dependencies {
+    private val v = Versions()
+    val kotlin = "org.jetbrains.kotlin:kotlin-stdlib:${v.kotlin}"
+    val kotlinTest = "org.jetbrains.kotlin:kotlin-test-junit:${v.kotlin}"
+    val junit = "junit:junit:${v.junit}"
+    val espresso = "androidx.test.espresso:espresso-core:${v.espresso}"
+    val testRunner = "androidx.test.ext:junit:${v.testRunner}"
+    val testRules = "androidx.test:rules:${v.testRules}"
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/ca/allanwang/kau/KauPlugin.kt b/buildSrc/src/main/kotlin/ca/allanwang/kau/KauPlugin.kt
new file mode 100644
index 0000000..6be15e5
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ca/allanwang/kau/KauPlugin.kt
@@ -0,0 +1,17 @@
+package ca.allanwang.kau
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.create
+
+class KauPlugin : Plugin<Project> {
+
+    override fun apply(project: Project) {
+        project.extensions.run {
+            create<Versions>("kau")
+            create<Dependencies>("kauDependency")
+            create<Plugins>("kauPlugin")
+            create<ChangelogGenerator>("kauChangelog", project)
+        }
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/ca/allanwang/kau/Plugins.kt b/buildSrc/src/main/kotlin/ca/allanwang/kau/Plugins.kt
new file mode 100644
index 0000000..c8265ab
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ca/allanwang/kau/Plugins.kt
@@ -0,0 +1,16 @@
+package ca.allanwang.kau
+
+/**
+ * Some common buildscript plugins, backed by the supplied versions
+ */
+open class Plugins {
+    private val v = Versions()
+    val android = "com.android.tools.build:gradle:${v.gradlePlugin}"
+    val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${v.kotlin}"
+    val androidMaven = "com.github.dcendents:android-maven-gradle-plugin:${v.mavenPlugin}"
+    val playPublisher = "com.github.triplet.gradle:play-publisher:${v.playPublishPlugin}"
+    val dexCount = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${v.dexCountPlugin}"
+    val gitVersion =
+        "gradle.plugin.com.gladed.gradle.androidgitversion:gradle-android-git-version:${v.gitVersionPlugin}"
+    val spotless = "com.diffplug.spotless:spotless-plugin-gradle:${v.spotless}"
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/ca/allanwang/kau/Versions.kt b/buildSrc/src/main/kotlin/ca/allanwang/kau/Versions.kt
new file mode 100644
index 0000000..8c14a92
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ca/allanwang/kau/Versions.kt
@@ -0,0 +1,80 @@
+package ca.allanwang.kau
+
+open class Versions {
+    val coreMinSdk = 19
+    val minSdk = 21
+    val targetSdk = 28
+
+    // https://developer.android.com/studio/releases/build-tools
+    val buildTools = "28.0.3"
+
+    // https://mvnrepository.com/artifact/androidx.appcompat/appcompat?repo=google
+    val appcompat = "1.0.2"
+
+    // https://mvnrepository.com/artifact/com.google.android.material/material
+    val googleMaterial = "1.0.0"
+
+    // https://mvnrepository.com/artifact/androidx.recyclerview/recyclerview
+    val recyclerView = "1.0.0"
+
+    // https://mvnrepository.com/artifact/androidx.cardview/cardview
+    val cardView = "1.0.0"
+
+    // https://mvnrepository.com/artifact/androidx.constraintlayout/constraintlayout
+    val constraintLayout = "1.1.3"
+
+    // https://kotlinlang.org/docs/reference/using-gradle.html
+    val kotlin = "1.3.31"
+
+    // https://github.com/Kotlin/kotlinx.coroutines/releases
+    val coroutines = "1.2.1"
+
+    // https://github.com/mikepenz/AboutLibraries/releases
+    val aboutLibraries = "6.2.3"
+
+    // https://github.com/wasabeef/Blurry/releases
+    val blurry = "3.0.0"
+
+    // https://github.com/mikepenz/FastAdapter#using-maven
+    val fastAdapter = "3.3.1"
+    val fastAdapterCommons = fastAdapter
+
+    // https://github.com/bumptech/glide/releases
+    val glide = "4.9.0"
+
+    // https://github.com/mikepenz/Android-Iconics#1-provide-the-gradle-dependency
+    val iconics = "3.2.5"
+    val iconicsGoogle = "3.0.1.3"
+    val iconicsMaterial = "2.2.0.5"
+    val iconicsCommunity = "3.5.95.1"
+
+    // https://github.com/afollestad/material-dialogs/releases
+    val materialDialog = "3.0.0-rc2"
+
+    // https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core?repo=google
+    val espresso = "3.1.1"
+
+    // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
+    val junit = "4.12"
+
+    val testRunner = "1.1.0"
+
+    // https://mvnrepository.com/artifact/androidx.test/rules?repo=google
+    val testRules = "1.1.1"
+
+    // https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md
+    val spotless = "3.18.0"
+
+    // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
+    val gradlePlugin = "3.4.1"
+    // https://github.com/dcendents/android-maven-gradle-plugin/releases
+    val mavenPlugin = "2.1"
+    // https://github.com/Triple-T/gradle-play-publisher/releases
+    val playPublishPlugin = "2.1.0"
+
+    // https://github.com/KeepSafe/dexcount-gradle-plugin/releases
+    val dexCountPlugin = "0.8.6"
+
+    // https://github.com/gladed/gradle-android-git-version/releases
+    val gitVersionPlugin = "0.4.7"
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/ca.allanwang.kau.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/ca.allanwang.kau.properties
deleted file mode 100644
index ba824cd..0000000
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/ca.allanwang.kau.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=ca.allanwang.kau.KauPlugin
\ No newline at end of file