From df94b2f706c25514afc447c2cd37ea01dd821cf1 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Fri, 7 Jun 2019 14:46:08 -0400 Subject: Add short namespace for plugin --- about/build.gradle | 2 +- adapter/build.gradle | 6 +- android-lib.gradle | 20 ++-- build.gradle | 16 ++-- buildSrc/README.md | 24 ++--- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/ChangelogGenerator.kt | 103 -------------------- buildSrc/src/main/kotlin/Dependencies.kt | 11 --- buildSrc/src/main/kotlin/Plugins.kt | 12 --- buildSrc/src/main/kotlin/Versions.kt | 78 --------------- buildSrc/src/main/kotlin/kau/ChangelogGenerator.kt | 105 +++++++++++++++++++++ buildSrc/src/main/kotlin/kau/Dependencies.kt | 13 +++ buildSrc/src/main/kotlin/kau/Plugins.kt | 14 +++ buildSrc/src/main/kotlin/kau/Versions.kt | 80 ++++++++++++++++ colorpicker/build.gradle | 4 +- core-ui/build.gradle | 2 +- core/build.gradle | 22 ++--- kpref-activity/build.gradle | 2 +- mediapicker/build.gradle | 6 +- sample/build.gradle | 26 ++--- 20 files changed, 278 insertions(+), 270 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/ChangelogGenerator.kt delete mode 100644 buildSrc/src/main/kotlin/Dependencies.kt delete mode 100644 buildSrc/src/main/kotlin/Plugins.kt delete mode 100644 buildSrc/src/main/kotlin/Versions.kt create mode 100644 buildSrc/src/main/kotlin/kau/ChangelogGenerator.kt create mode 100644 buildSrc/src/main/kotlin/kau/Dependencies.kt create mode 100644 buildSrc/src/main/kotlin/kau/Plugins.kt create mode 100644 buildSrc/src/main/kotlin/kau/Versions.kt diff --git a/about/build.gradle b/about/build.gradle index 3aa9ef2..7578ce0 100644 --- a/about/build.gradle +++ b/about/build.gradle @@ -10,7 +10,7 @@ dependencies { implementation project(':core-ui') implementation project(':adapter') - api("com.mikepenz:aboutlibraries:${Versions.aboutLibraries}@aar") { + api("com.mikepenz:aboutlibraries:${kau.Versions.aboutLibraries}@aar") { transitive = false } } diff --git a/adapter/build.gradle b/adapter/build.gradle index 8826c7d..a37330e 100644 --- a/adapter/build.gradle +++ b/adapter/build.gradle @@ -1,12 +1,12 @@ -ext.kauSubModuleMinSdk = Versions.coreMinSdk +ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk apply from: '../android-lib.gradle' dependencies { implementation project(':core') - api "com.mikepenz:fastadapter-commons:${Versions.fastAdapterCommons}@aar" - api "com.mikepenz:fastadapter:${Versions.fastAdapter}@aar" + api "com.mikepenz:fastadapter-commons:${kau.Versions.fastAdapterCommons}@aar" + api "com.mikepenz:fastadapter:${kau.Versions.fastAdapter}@aar" } apply from: '../artifacts.gradle' diff --git a/android-lib.gradle b/android-lib.gradle index 598ddcb..2d44be1 100644 --- a/android-lib.gradle +++ b/android-lib.gradle @@ -6,15 +6,15 @@ apply plugin: 'com.getkeepsafe.dexcount' group = "ca.allanwang" android { - compileSdkVersion Versions.targetSdk - buildToolsVersion Versions.buildTools + compileSdkVersion kau.Versions.targetSdk + buildToolsVersion kau.Versions.buildTools androidGitVersion { codeFormat = 'MMNNPPXX' format = '%tag%%.count%%-commit%' } - def kauMinSdk = Versions.minSdk + def kauMinSdk = kau.Versions.minSdk if (project.hasProperty('kauSubModuleMinSdk')) kauMinSdk = kauSubModuleMinSdk @@ -26,7 +26,7 @@ android { defaultConfig { minSdkVersion kauMinSdk - targetSdkVersion Versions.targetSdk + targetSdkVersion kau.Versions.targetSdk versionName androidGitVersion.name() versionCode androidGitVersion.code() consumerProguardFiles 'progress-proguard.txt' @@ -87,11 +87,11 @@ android { } dependencies { - testImplementation Dependencies.kotlinTest - testImplementation Dependencies.junit + testImplementation kau.Dependencies.kotlinTest + testImplementation kau.Dependencies.junit - androidTestImplementation Dependencies.kotlinTest - androidTestImplementation Dependencies.espresso - androidTestImplementation Dependencies.testRules - androidTestImplementation Dependencies.testRunner + androidTestImplementation kau.Dependencies.kotlinTest + androidTestImplementation kau.Dependencies.espresso + androidTestImplementation kau.Dependencies.testRules + androidTestImplementation kau.Dependencies.testRunner } \ No newline at end of file diff --git a/build.gradle b/build.gradle index bcdff15..81655fb 100644 --- a/build.gradle +++ b/build.gradle @@ -7,13 +7,13 @@ buildscript { } dependencies { - classpath Plugins.android - classpath Plugins.kotlin - classpath Plugins.androidMaven - classpath Plugins.playPublisher - classpath Plugins.dexCount - classpath Plugins.gitVersion - classpath Plugins.spotless + classpath kau.Plugins.android + classpath kau.Plugins.kotlin + classpath kau.Plugins.androidMaven + classpath kau.Plugins.playPublisher + classpath kau.Plugins.dexCount + classpath kau.Plugins.gitVersion + classpath kau.Plugins.spotless } wrapper.setDistributionType(Wrapper.DistributionType.ALL) @@ -24,7 +24,7 @@ task clean(type: Delete) { } task generateChangelogMd { - ChangelogGenerator.generate("${project.rootDir}/sample/src/main/res/xml/kau_changelog.xml", "${project.rootDir}/docs/Changelog.md") + kau.ChangelogGenerator.generate("${project.rootDir}/sample/src/main/res/xml/kau_changelog.xml", "${project.rootDir}/docs/Changelog.md") } subprojects { diff --git a/buildSrc/README.md b/buildSrc/README.md index 8889675..f79303c 100644 --- a/buildSrc/README.md +++ b/buildSrc/README.md @@ -9,9 +9,9 @@ As a note, this is located under `buildSrc` as it is automatically included when Everything here is used when generating the library, so it's always tested. ## Contents -* [Versions](#versions) -* [Plugins](#plugins) -* [Dependencies](#dependencies) +* [kau.Versions](#versions) +* [kau.Plugins](#plugins) +* [kau.Dependencies](#dependencies) * [Changelog Generator](#changelog-generator) ## Usage @@ -38,9 +38,9 @@ Then where necessary, apply the plugin using apply plugin: 'ca.allanwang.kau' ``` -# Versions +# kau.Versions -> [Versions.groovy](/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy) +> [kau.Versions.groovy](/buildSrc/src/main/groovy/ca/allanwang/kau/Versions.groovy) Contains the version code for any external library used in KAU. You are free to use the values through `kau.[tagName]`. @@ -51,26 +51,26 @@ As an example, AppCompat is imported in KAU using api "androidx.appcompat:appcompat:${kau.appcompat}" ``` -# Plugins +# kau.Plugins -> [Plugins.groovy](/buildSrc/src/main/groovy/ca/allanwang/kau/Plugins.groovy) +> [kau.Plugins.groovy](/buildSrc/src/main/groovy/ca/allanwang/kau/Plugins.groovy) Unfortunately, it seems like you can't use the plugin directly in the buildscript, so this is mainly internal. The plugins data, found using `kauPlugins.[tagName]` contains a collection of useful plugin classpaths. -The versions are taken from `Versions.groovy`, so it is always in sync. +The versions are taken from `kau.Versions.groovy`, so it is always in sync. -# Dependencies +# kau.Dependencies -> [Dependencies.groovy](/buildSrc/src/main/groovy/ca/allanwang/kau/Dependencies.groovy) +> [kau.Dependencies.groovy](/buildSrc/src/main/groovy/ca/allanwang/kau/Dependencies.groovy) Contains the dependency string for common libraries. -You are free to use the values through `Dependencies.[tagName]`. +You are free to use the values through `kau.Dependencies.[tagName]`. As an example, adding junit can be done through ```gradle -testImplementation Dependencies.junit +testImplementation kau.Dependencies.junit ``` # Changelog Generator diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 9bd5e13..89cba29 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -6,5 +6,5 @@ plugins { group = "ca.allanwang" repositories { - mavenCentral() + jcenter() } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/ChangelogGenerator.kt b/buildSrc/src/main/kotlin/ChangelogGenerator.kt deleted file mode 100644 index 4be3ecf..0000000 --- a/buildSrc/src/main/kotlin/ChangelogGenerator.kt +++ /dev/null @@ -1,103 +0,0 @@ -import groovy.util.Node -import groovy.util.XmlParser -import org.gradle.api.GradleException -import java.io.File - -/** - * Given an xml of the format - * - * - * - * - * - * - * - * - * - * - * Outputs a changelog in markdown format - */ -object ChangelogGenerator { - - class ChangelogException(message: String) : GradleException(message) - - private fun fail(message: String): Nothing = - throw ChangelogException(message) - - class ChangelogEntry(val version: String, val items: Array) - - private fun Node.forEachNode(action: (Node) -> Unit) { - children().forEach { - action(it as Node) - } - } - - @JvmStatic - fun read(inputUri: String): List { - val input = File(inputUri) - if (!input.exists()) { - fail("Could not generate changelog from ${input.absolutePath}") - } - - val parser = XmlParser().parse(inputUri) - - val entries: MutableList = mutableListOf() - var version: String? = null - val items: MutableList = 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 - } - - @JvmStatic - fun generate(inputUri: String, outputUri: String): List { - 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/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index 3fd40ed..0000000 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Some common dependencies, backed by the supplied versions - */ -object Dependencies { - const val kotlin = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}" - const val kotlinTest = "org.jetbrains.kotlin:kotlin-test-junit:${Versions.kotlin}" - const val junit = "junit:junit:${Versions.junit}" - const val espresso = "androidx.test.espresso:espresso-core:${Versions.espresso}" - const val testRunner = "androidx.test.ext:junit:${Versions.testRunner}" - const val testRules = "androidx.test:rules:${Versions.testRules}" -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Plugins.kt b/buildSrc/src/main/kotlin/Plugins.kt deleted file mode 100644 index e321628..0000000 --- a/buildSrc/src/main/kotlin/Plugins.kt +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Some common buildscript plugins, backed by the supplied versions - */ -object Plugins { - const val android = "com.android.tools.build:gradle:${Versions.gradlePlugin}" - const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" - const val androidMaven = "com.github.dcendents:android-maven-gradle-plugin:${Versions.mavenPlugin}" - const val playPublisher = "com.github.triplet.gradle:play-publisher:${Versions.playPublishPlugin}" - const val dexCount = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${Versions.dexCountPlugin}" - const val gitVersion = "com.gladed.androidgitversion:gradle-android-git-version:${Versions.gitVersionPlugin}" - const val spotless = "com.diffplug.spotless:spotless-plugin-gradle:${Versions.spotless}" -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt deleted file mode 100644 index 7f4cdca..0000000 --- a/buildSrc/src/main/kotlin/Versions.kt +++ /dev/null @@ -1,78 +0,0 @@ -object Versions { - const val coreMinSdk = 19 - const val minSdk = 21 - const val targetSdk = 28 - - // https://developer.android.com/studio/releases/build-tools - const val buildTools = "28.0.3" - - // https://mvnrepository.com/artifact/androidx.appcompat/appcompat?repo=google - const val appcompat = "1.0.2" - - // https://mvnrepository.com/artifact/com.google.android.material/material - const val googleMaterial = "1.0.0" - - // https://mvnrepository.com/artifact/androidx.recyclerview/recyclerview - const val recyclerView = "1.0.0" - - // https://mvnrepository.com/artifact/androidx.cardview/cardview - const val cardView = "1.0.0" - - // https://mvnrepository.com/artifact/androidx.constraintlayout/constraintlayout - const val constraintLayout = "1.1.3" - - // https://kotlinlang.org/docs/reference/using-gradle.html - const val kotlin = "1.3.31" - - // https://github.com/Kotlin/kotlinx.coroutines/releases - const val coroutines = "1.3.0-M1" - - // https://github.com/mikepenz/AboutLibraries/releases - const val aboutLibraries = "6.2.3" - - // https://github.com/wasabeef/Blurry/releases - const val blurry = "3.0.0" - - // https://github.com/mikepenz/FastAdapter#using-maven - const val fastAdapter = "3.3.1" - const val fastAdapterCommons = fastAdapter - - // https://github.com/bumptech/glide/releases - const val glide = "4.9.0" - - // https://github.com/mikepenz/Android-Iconics#1-provide-the-gradle-dependency - const val iconics = "3.2.5" - const val iconicsGoogle = "3.0.1.3" - const val iconicsMaterial = "2.2.0.5" - const val iconicsCommunity = "3.5.95.1" - - // https://github.com/afollestad/material-dialogs/releases - const val materialDialog = "3.0.0-rc2" - - // https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core?repo=google - const val espresso = "3.1.1" - - // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api - const val junit = "4.12" - - const val testRunner = "1.1.0" - - // https://mvnrepository.com/artifact/androidx.test/rules?repo=google - const val testRules = "1.1.1" - - // https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md - const val spotless = "3.18.0" - - // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google - const val gradlePlugin = "3.4.1" - // https://github.com/dcendents/android-maven-gradle-plugin/releases - const val mavenPlugin = "2.1" - // https://github.com/Triple-T/gradle-play-publisher/releases - const val playPublishPlugin = "2.2.1" - - // https://github.com/KeepSafe/dexcount-gradle-plugin/releases - const val dexCountPlugin = "0.8.6" - - // https://github.com/gladed/gradle-android-git-version/releases - const val gitVersionPlugin = "0.4.9" -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/kau/ChangelogGenerator.kt b/buildSrc/src/main/kotlin/kau/ChangelogGenerator.kt new file mode 100644 index 0000000..20e8eef --- /dev/null +++ b/buildSrc/src/main/kotlin/kau/ChangelogGenerator.kt @@ -0,0 +1,105 @@ +package kau + +import groovy.util.Node +import groovy.util.XmlParser +import org.gradle.api.GradleException +import java.io.File + +/** + * Given an xml of the format + * + * + * + * + * + * + * + * + * + * + * Outputs a changelog in markdown format + */ +object ChangelogGenerator { + + class ChangelogException(message: String) : GradleException(message) + + private fun fail(message: String): Nothing = + throw ChangelogException(message) + + class ChangelogEntry(val version: String, val items: Array) + + private fun Node.forEachNode(action: (Node) -> Unit) { + children().forEach { + action(it as Node) + } + } + + @JvmStatic + fun read(inputUri: String): List { + val input = File(inputUri) + if (!input.exists()) { + fail("Could not generate changelog from ${input.absolutePath}") + } + + val parser = XmlParser().parse(inputUri) + + val entries: MutableList = mutableListOf() + var version: String? = null + val items: MutableList = 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 + } + + @JvmStatic + fun generate(inputUri: String, outputUri: String): List { + 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/kau/Dependencies.kt b/buildSrc/src/main/kotlin/kau/Dependencies.kt new file mode 100644 index 0000000..62c938c --- /dev/null +++ b/buildSrc/src/main/kotlin/kau/Dependencies.kt @@ -0,0 +1,13 @@ +package kau + +/** + * Some common dependencies, backed by the supplied versions + */ +object Dependencies { + const val kotlin = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}" + const val kotlinTest = "org.jetbrains.kotlin:kotlin-test-junit:${Versions.kotlin}" + const val junit = "junit:junit:${Versions.junit}" + const val espresso = "androidx.test.espresso:espresso-core:${Versions.espresso}" + const val testRunner = "androidx.test.ext:junit:${Versions.testRunner}" + const val testRules = "androidx.test:rules:${Versions.testRules}" +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/kau/Plugins.kt b/buildSrc/src/main/kotlin/kau/Plugins.kt new file mode 100644 index 0000000..cdee364 --- /dev/null +++ b/buildSrc/src/main/kotlin/kau/Plugins.kt @@ -0,0 +1,14 @@ +package kau + +/** + * Some common buildscript plugins, backed by the supplied versions + */ +object Plugins { + const val android = "com.android.tools.build:gradle:${Versions.gradlePlugin}" + const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" + const val androidMaven = "com.github.dcendents:android-maven-gradle-plugin:${Versions.mavenPlugin}" + const val playPublisher = "com.github.triplet.gradle:play-publisher:${Versions.playPublishPlugin}" + const val dexCount = "com.getkeepsafe.dexcount:dexcount-gradle-plugin:${Versions.dexCountPlugin}" + const val gitVersion = "com.gladed.androidgitversion:gradle-android-git-version:${Versions.gitVersionPlugin}" + const val spotless = "com.diffplug.spotless:spotless-plugin-gradle:${Versions.spotless}" +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt new file mode 100644 index 0000000..32db3a5 --- /dev/null +++ b/buildSrc/src/main/kotlin/kau/Versions.kt @@ -0,0 +1,80 @@ +package kau + +object Versions { + const val coreMinSdk = 19 + const val minSdk = 21 + const val targetSdk = 28 + + // https://developer.android.com/studio/releases/build-tools + const val buildTools = "28.0.3" + + // https://mvnrepository.com/artifact/androidx.appcompat/appcompat?repo=google + const val appcompat = "1.0.2" + + // https://mvnrepository.com/artifact/com.google.android.material/material + const val googleMaterial = "1.0.0" + + // https://mvnrepository.com/artifact/androidx.recyclerview/recyclerview + const val recyclerView = "1.0.0" + + // https://mvnrepository.com/artifact/androidx.cardview/cardview + const val cardView = "1.0.0" + + // https://mvnrepository.com/artifact/androidx.constraintlayout/constraintlayout + const val constraintLayout = "1.1.3" + + // https://kotlinlang.org/docs/reference/using-gradle.html + const val kotlin = "1.3.31" + + // https://github.com/Kotlin/kotlinx.coroutines/releases + const val coroutines = "1.3.0-M1" + + // https://github.com/mikepenz/AboutLibraries/releases + const val aboutLibraries = "6.2.3" + + // https://github.com/wasabeef/Blurry/releases + const val blurry = "3.0.0" + + // https://github.com/mikepenz/FastAdapter#using-maven + const val fastAdapter = "3.3.1" + const val fastAdapterCommons = fastAdapter + + // https://github.com/bumptech/glide/releases + const val glide = "4.9.0" + + // https://github.com/mikepenz/Android-Iconics#1-provide-the-gradle-dependency + const val iconics = "3.2.5" + const val iconicsGoogle = "3.0.1.3" + const val iconicsMaterial = "2.2.0.5" + const val iconicsCommunity = "3.5.95.1" + + // https://github.com/afollestad/material-dialogs/releases + const val materialDialog = "3.0.0-rc2" + + // https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core?repo=google + const val espresso = "3.1.1" + + // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api + const val junit = "4.12" + + const val testRunner = "1.1.0" + + // https://mvnrepository.com/artifact/androidx.test/rules?repo=google + const val testRules = "1.1.1" + + // https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md + const val spotless = "3.18.0" + + // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google + const val gradlePlugin = "3.4.1" + // https://github.com/dcendents/android-maven-gradle-plugin/releases + const val mavenPlugin = "2.1" + // https://github.com/Triple-T/gradle-play-publisher/releases + const val playPublishPlugin = "2.2.1" + + // https://github.com/KeepSafe/dexcount-gradle-plugin/releases + const val dexCountPlugin = "0.8.6" + + // https://github.com/gladed/gradle-android-git-version/releases + const val gitVersionPlugin = "0.4.9" +} \ No newline at end of file diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle index 33e73cc..0b58996 100644 --- a/colorpicker/build.gradle +++ b/colorpicker/build.gradle @@ -1,13 +1,13 @@ ext.kauSubModuleResourcePrefix = "kau_color_" -ext.kauSubModuleMinSdk = Versions.coreMinSdk +ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk apply from: '../android-lib.gradle' dependencies { implementation project(':core') - implementation "com.afollestad.material-dialogs:color:${Versions.materialDialog}" + implementation "com.afollestad.material-dialogs:color:${kau.Versions.materialDialog}" } apply from: '../artifacts.gradle' diff --git a/core-ui/build.gradle b/core-ui/build.gradle index 816e53a..c2732c6 100644 --- a/core-ui/build.gradle +++ b/core-ui/build.gradle @@ -1,4 +1,4 @@ -ext.kauSubModuleMinSdk = Versions.coreMinSdk +ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk apply from: '../android-lib.gradle' diff --git a/core/build.gradle b/core/build.gradle index 0cba076..43cdc6d 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,22 +1,22 @@ -ext.kauSubModuleMinSdk = Versions.coreMinSdk +ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk apply from: '../android-lib.gradle' dependencies { - api Dependencies.kotlin + api kau.Dependencies.kotlin - api "androidx.appcompat:appcompat:${Versions.appcompat}" - api "androidx.recyclerview:recyclerview:${Versions.recyclerView}" - api "androidx.cardview:cardview:${Versions.cardView}" - api "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}" - api "com.google.android.material:material:${Versions.googleMaterial}" + api "androidx.appcompat:appcompat:${kau.Versions.appcompat}" + api "androidx.recyclerview:recyclerview:${kau.Versions.recyclerView}" + api "androidx.cardview:cardview:${kau.Versions.cardView}" + api "androidx.constraintlayout:constraintlayout:${kau.Versions.constraintLayout}" + api "com.google.android.material:material:${kau.Versions.googleMaterial}" - api "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutines}" + api "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kau.Versions.coroutines}" - api "com.mikepenz:iconics-core:${Versions.iconics}@aar" - api "com.mikepenz:google-material-typeface:${Versions.iconicsGoogle}.original@aar" + api "com.mikepenz:iconics-core:${kau.Versions.iconics}@aar" + api "com.mikepenz:google-material-typeface:${kau.Versions.iconicsGoogle}.original@aar" - api "com.afollestad.material-dialogs:core:${Versions.materialDialog}" + api "com.afollestad.material-dialogs:core:${kau.Versions.materialDialog}" } apply from: '../artifacts.gradle' diff --git a/kpref-activity/build.gradle b/kpref-activity/build.gradle index f22a4a0..e2e2771 100644 --- a/kpref-activity/build.gradle +++ b/kpref-activity/build.gradle @@ -1,4 +1,4 @@ -ext.kauSubModuleMinSdk = Versions.coreMinSdk +ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk ext.kauSubModuleResourcePrefix = "kau_pref_" diff --git a/mediapicker/build.gradle b/mediapicker/build.gradle index 3d4819a..5f4e6a7 100644 --- a/mediapicker/build.gradle +++ b/mediapicker/build.gradle @@ -1,4 +1,4 @@ -ext.kauSubModuleMinSdk = Versions.coreMinSdk +ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk apply from: '../android-lib.gradle' apply plugin: 'kotlin-kapt' @@ -8,8 +8,8 @@ dependencies { implementation project(':adapter') //noinspection GradleDependency - api "com.github.bumptech.glide:glide:${Versions.glide}" - implementation "jp.wasabeef:blurry:${Versions.blurry}" + api "com.github.bumptech.glide:glide:${kau.Versions.glide}" + implementation "jp.wasabeef:blurry:${kau.Versions.blurry}" } apply from: '../artifacts.gradle' diff --git a/sample/build.gradle b/sample/build.gradle index 5f795db..e31a312 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -9,8 +9,8 @@ play { } android { - compileSdkVersion Versions.targetSdk - buildToolsVersion Versions.buildTools + compileSdkVersion kau.Versions.targetSdk + buildToolsVersion kau.Versions.buildTools androidGitVersion { codeFormat = 'MMNNPPXX' @@ -19,8 +19,8 @@ android { defaultConfig { applicationId "ca.allanwang.kau.sample" - minSdkVersion Versions.minSdk - targetSdkVersion Versions.targetSdk + minSdkVersion kau.Versions.minSdk + targetSdkVersion kau.Versions.targetSdk versionName androidGitVersion.name() versionCode androidGitVersion.code() multiDexEnabled true @@ -127,15 +127,15 @@ dependencies { implementation project(':searchview') implementation project(':mediapicker') - implementation "com.afollestad.material-dialogs:input:${Versions.materialDialog}" + implementation "com.afollestad.material-dialogs:input:${kau.Versions.materialDialog}" - testImplementation Dependencies.kotlinTest - testImplementation Dependencies.junit + testImplementation kau.Dependencies.kotlinTest + testImplementation kau.Dependencies.junit - androidTestImplementation Dependencies.kotlinTest - androidTestImplementation Dependencies.espresso - androidTestImplementation "androidx.test.espresso:espresso-intents:${Versions.espresso}" - androidTestImplementation "androidx.test.espresso:espresso-contrib:${Versions.espresso}" - androidTestImplementation Dependencies.testRules - androidTestImplementation Dependencies.testRunner + androidTestImplementation kau.Dependencies.kotlinTest + androidTestImplementation kau.Dependencies.espresso + androidTestImplementation "androidx.test.espresso:espresso-intents:${kau.Versions.espresso}" + androidTestImplementation "androidx.test.espresso:espresso-contrib:${kau.Versions.espresso}" + androidTestImplementation kau.Dependencies.testRules + androidTestImplementation kau.Dependencies.testRunner } -- cgit v1.2.3