From d94017e6f6df67e80604111028ea16f6c7f4e077 Mon Sep 17 00:00:00 2001
From: Allan Wang <allanwang@google.com>
Date: Fri, 26 Jul 2019 14:53:29 -0700
Subject: Update versions and setup with google

---
 .gitignore                                         |   4 +-
 .idea/codeStyles/Project.xml                       | 136 ---------------------
 .idea/vcs.xml                                      |   6 -
 buildSrc/src/main/kotlin/kau/Versions.kt           |   6 +-
 core-ui/src/main/res-public/values/public.xml      |   4 +-
 .../ca/allanwang/kau/swipe/ViewDragHelper.java     |   2 +-
 core/src/main/res-public/values/public.xml         |  52 ++++----
 gradle/wrapper/gradle-wrapper.properties           |   2 +-
 8 files changed, 36 insertions(+), 176 deletions(-)
 delete mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index ef20a58..f08bd63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,6 @@
 .idea/**/assetWizardSettings.xml
 .idea/**/caches
 .idea/modules.xml
-.idea/modules
\ No newline at end of file
+.idea/modules
+.idea/vcs.xml
+.idea/codeStyles/Project.xml
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index be6976d..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-        </value>
-      </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </XML>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt
index 515f702..4deb3b7 100644
--- a/buildSrc/src/main/kotlin/kau/Versions.kt
+++ b/buildSrc/src/main/kotlin/kau/Versions.kt
@@ -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"
@@ -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
diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml
index af7ce44..71657d6 100644
--- a/core-ui/src/main/res-public/values/public.xml
+++ b/core-ui/src/main/res-public/values/public.xml
@@ -1,8 +1,8 @@
-<resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'>
+<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_elastic_recycler_activity' type='layout' />
     <public name='Kau.Translucent' type='style' />
     <public name='Kau.Translucent.NoAnimation' type='style' />
     <public name='Kau.Translucent.SlideBottom' type='style' />
diff --git a/core/src/main/kotlin/ca/allanwang/kau/swipe/ViewDragHelper.java b/core/src/main/kotlin/ca/allanwang/kau/swipe/ViewDragHelper.java
index ac7fb7e..f6e907a 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/swipe/ViewDragHelper.java
+++ b/core/src/main/kotlin/ca/allanwang/kau/swipe/ViewDragHelper.java
@@ -25,7 +25,7 @@ import static ca.allanwang.kau.swipe.SwipeBackHelperKt.SWIPE_EDGE_TOP;
  * of useful operations and state tracking for allowing a user to drag and reposition
  * views within their parent ViewGroup.
  * <p>
- * This is an extension of {@link androidx.core.widget.ViewDragHelper}
+ * This is an extension of {@link androidx.customview.widget.ViewDragHelper}
  * Along with additional methods defined in {@link ViewDragHelperExtras}
  */
 class ViewDragHelper implements ViewDragHelperExtras {
diff --git a/core/src/main/res-public/values/public.xml b/core/src/main/res-public/values/public.xml
index 9761199..0b050dc 100644
--- a/core/src/main/res-public/values/public.xml
+++ b/core/src/main/res-public/values/public.xml
@@ -1,20 +1,27 @@
-<resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'>
+<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_enter_slide_left' type='transition' />
+    <public name='kau_exit_slide_right' type='transition' />
+    <public name='kau_exit_slide_bottom' type='transition' />
+    <public name='kau_enter_slide_bottom' type='transition' />
+    <public name='kau_enter_slide_right' type='transition' />
+    <public name='kau_exit_slide_top' type='transition' />
+    <public name='kau_enter_slide_top' type='transition' />
+    <public name='kau_exit_slide_left' type='transition' />
+    <public name='kau_selectable_white' type='drawable' />
+    <public name='kau_transparent' type='drawable' />
+    <public name='kau_slide_out_left_top' type='anim' />
+    <public name='kau_slide_in_right' type='anim' />
+    <public name='kau_slide_out_right_top' type='anim' />
     <public name='kau_slide_in_top' type='anim' />
-    <public name='kau_slide_in_left' type='anim' />
+    <public name='kau_slide_out_left' type='anim' />
     <public name='kau_slide_out_right' 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_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_out_top' type='anim' />
+    <public name='kau_fade_out' type='anim' />
+    <public name='kau_slide_in_left' type='anim' />
     <public name='kau_activity_horizontal_margin' type='dimen' />
     <public name='kau_activity_vertical_margin' type='dimen' />
     <public name='kau_dialog_margin' type='dimen' />
@@ -43,6 +50,13 @@
     <public name='kau_avatar_padding' type='dimen' />
     <public name='kau_avatar_margin' type='dimen' />
     <public name='kau_avatar_ripple_radius' type='dimen' />
+    <public name='KauFadeIn' type='style' />
+    <public name='KauFadeInFadeOut' type='style' />
+    <public name='KauSlideInRight' type='style' />
+    <public name='KauSlideInBottom' type='style' />
+    <public name='KauSlideInFadeOut' type='style' />
+    <public name='KauSlideInSlideOutRight' type='style' />
+    <public name='KauSlideInSlideOutBottom' type='style' />
     <public name='kau_about_app' type='string' />
     <public name='kau_about_x' type='string' />
     <public name='kau_add_account' type='string' />
@@ -98,21 +112,7 @@
     <public name='kau_permission_denied' type='string' />
     <public name='kau_0' type='string' />
     <public name='kau_bullet_point' type='string' />
+    <public name='kau_shadow_overlay' type='color' />
     <public name='Kau' type='style' />
     <public name='Kau.Translucent' type='style' />
-    <public name='KauFadeIn' type='style' />
-    <public name='KauFadeInFadeOut' type='style' />
-    <public name='KauSlideInRight' type='style' />
-    <public name='KauSlideInBottom' type='style' />
-    <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' />
 </resources>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9fccf04..f1f2eac 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
-- 
cgit v1.2.3