From 84eb0b30e16602710da87ff7f263baa6c5e747ea Mon Sep 17 00:00:00 2001
From: Aidan Follestad <afollestad@squareup.com>
Date: Sun, 6 Jan 2019 20:00:29 -0800
Subject: [PATCH] Dependency updates

---
 app/build.gradle            |  6 ++--
 common/build.gradle         |  2 +-
 dependencies.gradle         | 57 +++++++++++++++++++------------------
 notifications/build.gradle  |  2 +-
 viewcomponents/build.gradle |  2 +-
 5 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dbf9c87..a459efe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,9 +24,9 @@ dependencies {
   implementation project(':notifications')
   implementation project(':viewcomponents')
 
-  implementation 'androidx.appcompat:appcompat:' + versions.androidx
-  implementation 'androidx.recyclerview:recyclerview:' + versions.androidx
-  implementation 'com.google.android.material:material:' + versions.androidx
+  implementation 'androidx.appcompat:appcompat:' + versions.androidxCore
+  implementation 'androidx.recyclerview:recyclerview:' + versions.androidxRecyclerView
+  implementation 'com.google.android.material:material:' + versions.googleMaterial
 
   kapt 'androidx.lifecycle:lifecycle-compiler:' + versions.lifecycle
 
diff --git a/common/build.gradle b/common/build.gradle
index 9072c6a..59634ca 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-  implementation 'androidx.annotation:annotation:' + versions.androidx
+  implementation 'androidx.annotation:annotation:' + versions.androidxAnnotations
   api 'androidx.lifecycle:lifecycle-extensions:' + versions.lifecycle
 
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
diff --git a/dependencies.gradle b/dependencies.gradle
index e7427e5..28a58cf 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,37 +1,40 @@
 ext.versions = [
-    minSdk            : 21,
-    compileSdk        : 28,
-    buildTools        : '28.0.3',
-    publishVersion    : '0.8.0',
-    publishVersionCode: 28,
+    minSdk              : 21,
+    compileSdk          : 28,
+    buildTools          : '28.0.3',
+    publishVersion      : '0.8.0',
+    publishVersionCode  : 28,
 
-    gradlePlugin      : '3.2.1',
-    spotlessPlugin    : '3.16.0',
-    versionPlugin     : '0.20.0',
+    gradlePlugin        : '3.2.1',
+    spotlessPlugin      : '3.17.0',
+    versionPlugin       : '0.20.0',
 
-    okHttp            : '3.12.0',
-    rhino             : '1.7.10',
+    okHttp              : '3.12.1',
+    rhino               : '1.7.10',
 
-    kotlin            : '1.3.10',
-    coroutines        : '1.0.1',
-    koin              : '1.0.2',
+    kotlin              : '1.3.11',
+    coroutines          : '1.1.0',
+    koin                : '1.0.2',
 
-    androidx          : '1.0.0',
-    room              : '2.0.0',
-    lifecycle         : '2.0.0',
+    androidxAnnotations : '1.0.1',
+    androidxCore        : '1.0.2',
+    androidxRecyclerView: '1.0.0',
+    googleMaterial      : '1.0.0',
+    room                : '2.0.0',
+    lifecycle           : '2.0.0',
 
-    rxBinding         : '3.0.0-alpha1',
+    rxBinding           : '3.0.0-alpha1',
 
-    materialDialogs   : '2.0.0-rc3',
-    rxkPrefs          : '1.2.0',
+    materialDialogs     : '2.0.0-rc7',
+    rxkPrefs            : '1.2.0',
 
-    timber            : '4.7.1',
-    junit             : '4.12',
-    mockito           : '2.23.0',
-    mockitoKotlin     : '2.0.0-RC1',
-    truth             : '0.42',
+    timber              : '4.7.1',
+    junit               : '4.12',
+    mockito             : '2.23.4',
+    mockitoKotlin       : '2.0.0-RC1',
+    truth               : '0.42',
 
-    androidxTestRunner: '1.1.0',
-    androidxTest      : '1.0.0',
-    archTesting       : '2.0.0'
+    androidxTestRunner  : '1.1.1',
+    androidxTest        : '1.1.0',
+    archTesting         : '2.0.0'
 ]
diff --git a/notifications/build.gradle b/notifications/build.gradle
index 24fd449..5cfdc84 100644
--- a/notifications/build.gradle
+++ b/notifications/build.gradle
@@ -16,7 +16,7 @@ android {
 dependencies {
   implementation project(':common')
 
-  api 'androidx.appcompat:appcompat:' + versions.androidx
+  api 'androidx.appcompat:appcompat:' + versions.androidxCore
 
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
   api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:' + versions.coroutines
diff --git a/viewcomponents/build.gradle b/viewcomponents/build.gradle
index aaa0ab7..abbff09 100644
--- a/viewcomponents/build.gradle
+++ b/viewcomponents/build.gradle
@@ -18,7 +18,7 @@ dependencies {
   implementation project(':common')
   implementation project(':data')
 
-  implementation 'androidx.appcompat:appcompat:' + versions.androidx
+  implementation 'androidx.appcompat:appcompat:' + versions.androidxCore
   api 'androidx.lifecycle:lifecycle-extensions:' + versions.lifecycle
 
   api 'com.squareup.okhttp3:okhttp:' + versions.okHttp