Fix conflicts

2 files changed, 49 insertions, 17 deletions

diff --git a/buildSrc/src/main/kotlin/kau/Dependencies.kt b/buildSrc/src/main/kotlin/kau/Dependencies.kt
index d1e2b89..b2cdf48 100644
--- a/buildSrc/src/main/kotlin/kau/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/kau/Dependencies.kt
@@ -7,8 +7,34 @@ object Dependencies {
     @JvmStatic
     fun kau(version: String) = "ca.allanwang:kau:$version"
 
+    private fun kau(type: String, version: String) = "ca.allanwang.kau:$type:$version"
+
+    @JvmStatic
+    fun kauAbout(version: String) = kau("about", version)
+
+    @JvmStatic
+    fun kauAdapter(version: String) = kau("adapter", version)
+
+    @JvmStatic
+    fun kauColorPicker(version: String) = kau("colorpicker", version)
+
+    @JvmStatic
+    fun kauCore(version: String) = kau("core", version)
+
+    @JvmStatic
+    fun kauCoreUi(version: String) = kau("core-ui", version)
+
+    @JvmStatic
+    fun kauFastAdapter(version: String) = kau("fastadapter", version)
+
+    @JvmStatic
+    fun kauKprefActivity(version: String) = kau("kpref-activity", version)
+
+    @JvmStatic
+    fun kauMediaPicker(version: String) = kau("mediapicker", version)
+
     @JvmStatic
-    fun kau(type: String, version: String) = "ca.allanwang.kau:$type:$version"
+    fun kauSearchView(version: String) = kau("searchview", version)
 
     @JvmStatic
     fun kotlin(type: String) = "org.jetbrains.kotlin:kotlin-$type:${Versions.kotlin}"
@@ -26,13 +52,17 @@ object Dependencies {
     const val appcompat = "androidx.appcompat:appcompat:${Versions.appcompat}"
     const val recyclerView = "androidx.recyclerview:recyclerview:${Versions.recyclerView}"
     const val cardView = "androidx.cardview:cardview:${Versions.cardView}"
-    const val constraintLayout = "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
+    const val constraintLayout =
+        "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
     const val googleMaterial = "com.google.android.material:material:${Versions.googleMaterial}"
 
     const val iconics = "com.mikepenz:iconics-core:${Versions.iconics}"
-    const val iconicsGoogle = "com.mikepenz:google-material-typeface:${Versions.iconicsGoogle}.original-kotlin@aar"
-    const val iconicsMaterial = "com.mikepenz:material-design-iconic-typeface:${Versions.iconicsMaterial}-kotlin@aar"
-    const val iconicsCommunity = "com.mikepenz:community-material-typeface:${Versions.iconicsCommunity}-kotlin@aar"
+    const val iconicsGoogle =
+        "com.mikepenz:google-material-typeface:${Versions.iconicsGoogle}.original-kotlin@aar"
+    const val iconicsMaterial =
+        "com.mikepenz:material-design-iconic-typeface:${Versions.iconicsMaterial}-kotlin@aar"
+    const val iconicsCommunity =
+        "com.mikepenz:community-material-typeface:${Versions.iconicsCommunity}-kotlin@aar"
 
     const val aboutLibraries = "com.mikepenz:aboutlibraries:${Versions.aboutLibraries}"
 
@@ -42,14 +72,16 @@ object Dependencies {
     const val glideKapt = "com.github.bumptech.glide:compiler:${Versions.glide}"
 
     @JvmStatic
-    fun materialDialog(type: String) = "com.afollestad.material-dialogs:$type:${Versions.materialDialog}"
+    fun materialDialog(type: String) =
+        "com.afollestad.material-dialogs:$type:${Versions.materialDialog}"
 
     @JvmField
     val materialDialog = materialDialog("core")
 
     const val fastAdapter = "com.mikepenz:fastadapter:${Versions.fastAdapter}"
     @JvmStatic
-    fun fastAdapter(type: String) = "com.mikepenz:fastadapter-extensions-$type:${Versions.fastAdapter}"
+    fun fastAdapter(type: String) =
+        "com.mikepenz:fastadapter-extensions-$type:${Versions.fastAdapter}"
 
     const val bugsnag = "com.bugsnag:bugsnag-android:${Versions.bugsnag}"
 
diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt
index f3fbd09..010aaa0 100644
--- a/buildSrc/src/main/kotlin/kau/Versions.kt
+++ b/buildSrc/src/main/kotlin/kau/Versions.kt
@@ -9,25 +9,25 @@ object Versions {
     const val buildTools = "29.0.0"
 
     // https://mvnrepository.com/artifact/androidx.appcompat/appcompat?repo=google
-    const val appcompat = "1.0.2"
+    const val appcompat = "1.1.0-rc01"
 
     // 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"
+    const val recyclerView = "1.1.0-beta02"
 
     // 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"
+    const val constraintLayout = "2.0.0-beta2"
 
     // https://kotlinlang.org/docs/reference/using-gradle.html
     const val kotlin = "1.3.41"
 
     // https://github.com/Kotlin/kotlinx.coroutines/releases
-    const val coroutines = "1.3.0-RC"
+    const val coroutines = "1.3.0-RC2"
 
     // https://github.com/mikepenz/AboutLibraries/releases
     const val aboutLibraries = "6.2.3"
@@ -35,7 +35,7 @@ object Versions {
     // https://github.com/wasabeef/Blurry/releases
     const val blurry = "3.0.0"
 
-    // https://github.com/mikepenz/FastAdapter#using-maven
+    // https://github.com/mikepenz/FastAdapter/releases
     const val fastAdapter = "4.1.0-b01"
 
     // https://github.com/bumptech/glide/releases
@@ -48,7 +48,7 @@ object Versions {
     const val iconicsCommunity = "3.5.95.1"
 
     // https://github.com/afollestad/material-dialogs/releases
-    const val materialDialog = "3.0.0-rc2"
+    const val materialDialog = "3.1.0"
 
     // https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core?repo=google
     const val espresso = "3.1.1"
@@ -62,16 +62,16 @@ object Versions {
     const val testRules = "1.1.1"
 
     // https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md
-    const val spotless = "3.18.0"
+    const val spotless = "3.24.1"
 
     // https://github.com/bugsnag/bugsnag-android/releases
-    const val bugsnag = "4.12.0"
+    const val bugsnag = "4.18.0"
 
     // https://github.com/bugsnag/bugsnag-android-gradle-plugin/releases
-    const val bugsnagPlugin="4.1.1"
+    const val bugsnagPlugin="4.5.2"
 
     // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
-    const val gradlePlugin = "3.5.0-rc01"
+    const val gradlePlugin = "3.5.0-rc03"
     // https://github.com/dcendents/android-maven-gradle-plugin/releases
     const val mavenPlugin = "2.1"
     // https://github.com/Triple-T/gradle-play-publisher/releases