aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-10-20 02:45:14 -0700
committerAllan Wang <me@allanwang.ca>2019-10-20 02:45:14 -0700
commit3550cd6916d44596dee9d9fb7c8a99cacd6f5303 (patch)
tree571997147df70782f573dab43fe7e02a4a18f0ae
parent9d8471a7c7d9f92972f9eb746b2d149a45dfd591 (diff)
parent09c6e4d1defb46616c57accbf505d0c237fea3d6 (diff)
downloadkau-3550cd6916d44596dee9d9fb7c8a99cacd6f5303.tar.gz
kau-3550cd6916d44596dee9d9fb7c8a99cacd6f5303.tar.bz2
kau-3550cd6916d44596dee9d9fb7c8a99cacd6f5303.zip
Merge branch 'dev' into viewbinding
-rw-r--r--buildSrc/src/main/kotlin/kau/Dependencies.kt4
-rw-r--r--buildSrc/src/main/kotlin/kau/Versions.kt3
2 files changed, 6 insertions, 1 deletions
diff --git a/buildSrc/src/main/kotlin/kau/Dependencies.kt b/buildSrc/src/main/kotlin/kau/Dependencies.kt
index 663f922..f7faeb0 100644
--- a/buildSrc/src/main/kotlin/kau/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/kau/Dependencies.kt
@@ -52,12 +52,14 @@ object Dependencies {
const val appcompat = "androidx.appcompat:appcompat:${Versions.appcompat}"
const val recyclerView = "androidx.recyclerview:recyclerview:${Versions.recyclerView}"
- const val swipeRefreshLayout = "androidx.swipeRefreshLayout:swipeRefreshLayout:${Versions.swipeRefreshLayout}"
+ const val swipeRefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:${Versions.swipeRefreshLayout}"
const val cardView = "androidx.cardview:cardview:${Versions.cardView}"
const val constraintLayout =
"androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
const val googleMaterial = "com.google.android.material:material:${Versions.googleMaterial}"
+ const val coreKtx = "androidx.core:core-ktx:${Versions.coreKtx}"
+
const val iconics = "com.mikepenz:iconics-core:${Versions.iconics}"
const val iconicsGoogle =
"com.mikepenz:google-material-typeface:${Versions.iconicsGoogle}.original-kotlin@aar"
diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt
index 4299984..7552139 100644
--- a/buildSrc/src/main/kotlin/kau/Versions.kt
+++ b/buildSrc/src/main/kotlin/kau/Versions.kt
@@ -26,6 +26,9 @@ object Versions {
// https://mvnrepository.com/artifact/androidx.constraintlayout/constraintlayout
const val constraintLayout = "2.0.0-beta2"
+ // https://mvnrepository.com/artifact/androidx.core/core-ktx
+ const val coreKtx = "1.1.0"
+
// https://kotlinlang.org/docs/reference/using-gradle.html
const val kotlin = "1.3.50"