Merge remote-tracking branch 'origin/dev' into databinding

3 files changed, 24 insertions, 24 deletions

diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt
index 010aaa0..a646292 100644
--- a/buildSrc/src/main/kotlin/kau/Versions.kt
+++ b/buildSrc/src/main/kotlin/kau/Versions.kt
@@ -27,7 +27,7 @@ object Versions {
     const val kotlin = "1.3.41"
 
     // https://github.com/Kotlin/kotlinx.coroutines/releases
-    const val coroutines = "1.3.0-RC2"
+    const val coroutines = "1.3.1"
 
     // https://github.com/mikepenz/AboutLibraries/releases
     const val aboutLibraries = "6.2.3"
@@ -36,7 +36,7 @@ object Versions {
     const val blurry = "3.0.0"
 
     // https://github.com/mikepenz/FastAdapter/releases
-    const val fastAdapter = "4.1.0-b01"
+    const val fastAdapter = "4.1.0-b02"
 
     // https://github.com/bumptech/glide/releases
     const val glide = "4.9.0"
@@ -71,7 +71,7 @@ object Versions {
     const val bugsnagPlugin="4.5.2"
 
     // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
-    const val gradlePlugin = "3.5.0-rc03"
+    const val gradlePlugin = "3.5.0"
     // https://github.com/dcendents/android-maven-gradle-plugin/releases
     const val mavenPlugin = "2.1"
     // https://github.com/Triple-T/gradle-play-publisher/releases
@@ -81,5 +81,5 @@ object Versions {
     const val dexCountPlugin = "0.8.6"
 
     // https://github.com/gladed/gradle-android-git-version/releases
-    const val gitVersionPlugin = "0.4.9"
+    const val gitVersionPlugin = "0.4.10"
 }
\ No newline at end of file
diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml
index c8c2e56..f62ed25 100644
--- a/core-ui/src/main/res-public/values/public.xml
+++ b/core-ui/src/main/res-public/values/public.xml
@@ -1,10 +1,10 @@
 <resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'>

 <!-- AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task -->
-    <public name='kau_recycler_detached_background' type='layout' />
-    <public name='kau_elastic_recycler_activity' type='layout' />
-    <public name='kau_recycler_textslider' type='layout' />
     <public name='Kau.Translucent' type='style' />
     <public name='Kau.Translucent.NoAnimation' type='style' />
     <public name='Kau.Translucent.SlideBottom' type='style' />
     <public name='Kau.Translucent.SlideTop' type='style' />
+    <public name='kau_recycler_detached_background' type='layout' />
+    <public name='kau_elastic_recycler_activity' type='layout' />
+    <public name='kau_recycler_textslider' type='layout' />
 </resources>
\ No newline at end of file
diff --git a/core/src/main/res-public/values/public.xml b/core/src/main/res-public/values/public.xml
index 211c539..443f32e 100644
--- a/core/src/main/res-public/values/public.xml
+++ b/core/src/main/res-public/values/public.xml
@@ -1,20 +1,25 @@
 <resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'>

 <!-- AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task -->
-    <public name='kau_slide_in_top' type='anim' />
     <public name='kau_slide_in_left' type='anim' />
-    <public name='kau_slide_out_right' type='anim' />
+    <public name='kau_slide_out_left' type='anim' />
     <public name='kau_slide_out_right_top' type='anim' />
-    <public name='kau_fade_in' type='anim' />
-    <public name='kau_slide_out_top' type='anim' />
-    <public name='kau_slide_out_bottom' type='anim' />
     <public name='kau_fade_out' type='anim' />
-    <public name='kau_slide_out_left' type='anim' />
     <public name='kau_slide_out_left_top' type='anim' />
+    <public name='kau_fade_in' type='anim' />
     <public name='kau_slide_in_bottom' type='anim' />
     <public name='kau_slide_in_right' type='anim' />
-    <public name='kau_transparent' type='drawable' />
-    <public name='kau_selectable_white' type='drawable' />
-    <public name='kau_shadow_overlay' type='color' />
+    <public name='kau_slide_in_top' type='anim' />
+    <public name='kau_slide_out_top' type='anim' />
+    <public name='kau_slide_out_bottom' type='anim' />
+    <public name='kau_slide_out_right' type='anim' />
+    <public name='kau_enter_slide_right' type='transition' />
+    <public name='kau_exit_slide_right' type='transition' />
+    <public name='kau_exit_slide_top' type='transition' />
+    <public name='kau_enter_slide_bottom' type='transition' />
+    <public name='kau_enter_slide_left' type='transition' />
+    <public name='kau_exit_slide_left' type='transition' />
+    <public name='kau_enter_slide_top' type='transition' />
+    <public name='kau_exit_slide_bottom' type='transition' />
     <public name='kau_activity_horizontal_margin' type='dimen' />
     <public name='kau_activity_vertical_margin' type='dimen' />
     <public name='kau_dialog_margin' type='dimen' />
@@ -100,6 +105,7 @@
     <public name='kau_bullet_point' type='string' />
     <public name='Kau' type='style' />
     <public name='Kau.Translucent' type='style' />
+    <public name='kau_shadow_overlay' type='color' />
     <public name='KauFadeIn' type='style' />
     <public name='KauFadeInFadeOut' type='style' />
     <public name='KauSlideInRight' type='style' />
@@ -107,12 +113,6 @@
     <public name='KauSlideInFadeOut' type='style' />
     <public name='KauSlideInSlideOutRight' type='style' />
     <public name='KauSlideInSlideOutBottom' type='style' />
-    <public name='kau_enter_slide_bottom' type='transition' />
-    <public name='kau_enter_slide_top' type='transition' />
-    <public name='kau_exit_slide_bottom' type='transition' />
-    <public name='kau_exit_slide_top' type='transition' />
-    <public name='kau_enter_slide_right' type='transition' />
-    <public name='kau_exit_slide_right' type='transition' />
-    <public name='kau_exit_slide_left' type='transition' />
-    <public name='kau_enter_slide_left' type='transition' />
+    <public name='kau_transparent' type='drawable' />
+    <public name='kau_selectable_white' type='drawable' />
 </resources>
\ No newline at end of file