aboutsummaryrefslogtreecommitdiff
path: root/buildSrc
diff options
context:
space:
mode:
authorAllan Wang <allanwang@google.com>2019-07-27 17:46:04 -0700
committerAllan Wang <allanwang@google.com>2019-07-27 17:46:04 -0700
commit50c8012e2fe88d6b275d1a3269033590962caa7f (patch)
tree65ebb32525be83441e6caac8362e3e9ae022bfd1 /buildSrc
parent01058912580a3ecfe77eaf6af209e1c46a97f2d7 (diff)
parentd94017e6f6df67e80604111028ea16f6c7f4e077 (diff)
downloadkau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.gz
kau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.bz2
kau-50c8012e2fe88d6b275d1a3269033590962caa7f.zip
Fix initial conflicts
Diffstat (limited to 'buildSrc')
-rw-r--r--buildSrc/src/main/kotlin/kau/Dependencies.kt6
-rw-r--r--buildSrc/src/main/kotlin/kau/Versions.kt14
2 files changed, 13 insertions, 7 deletions
diff --git a/buildSrc/src/main/kotlin/kau/Dependencies.kt b/buildSrc/src/main/kotlin/kau/Dependencies.kt
index 6634851..d1e2b89 100644
--- a/buildSrc/src/main/kotlin/kau/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/kau/Dependencies.kt
@@ -5,6 +5,12 @@ package kau
*/
object Dependencies {
@JvmStatic
+ fun kau(version: String) = "ca.allanwang:kau:$version"
+
+ @JvmStatic
+ fun kau(type: String, version: String) = "ca.allanwang.kau:$type:$version"
+
+ @JvmStatic
fun kotlin(type: String) = "org.jetbrains.kotlin:kotlin-$type:${Versions.kotlin}"
@JvmField
diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt
index d3718b6..f3fbd09 100644
--- a/buildSrc/src/main/kotlin/kau/Versions.kt
+++ b/buildSrc/src/main/kotlin/kau/Versions.kt
@@ -3,10 +3,10 @@ package kau
object Versions {
const val coreMinSdk = 19
const val minSdk = 21
- const val targetSdk = 28
+ const val targetSdk = 29
// https://developer.android.com/studio/releases/build-tools
- const val buildTools = "28.0.3"
+ const val buildTools = "29.0.0"
// https://mvnrepository.com/artifact/androidx.appcompat/appcompat?repo=google
const val appcompat = "1.0.2"
@@ -24,10 +24,10 @@ object Versions {
const val constraintLayout = "1.1.3"
// https://kotlinlang.org/docs/reference/using-gradle.html
- const val kotlin = "1.3.31"
+ const val kotlin = "1.3.41"
// https://github.com/Kotlin/kotlinx.coroutines/releases
- const val coroutines = "1.3.0-M1"
+ const val coroutines = "1.3.0-RC"
// https://github.com/mikepenz/AboutLibraries/releases
const val aboutLibraries = "6.2.3"
@@ -36,13 +36,13 @@ object Versions {
const val blurry = "3.0.0"
// https://github.com/mikepenz/FastAdapter#using-maven
- const val fastAdapter = "4.0.0"
+ const val fastAdapter = "4.1.0-b01"
// 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 = "4.0.0"
+ const val iconics = "4.0.1-b01"
const val iconicsGoogle = "3.0.1.4"
const val iconicsMaterial = "2.2.0.6"
const val iconicsCommunity = "3.5.95.1"
@@ -71,7 +71,7 @@ object Versions {
const val bugsnagPlugin="4.1.1"
// https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
- const val gradlePlugin = "3.4.1"
+ const val gradlePlugin = "3.5.0-rc01"
// https://github.com/dcendents/android-maven-gradle-plugin/releases
const val mavenPlugin = "2.1"
// https://github.com/Triple-T/gradle-play-publisher/releases