From 61ac619ef102e5839d8ac71bb47a801e24a484e4 Mon Sep 17 00:00:00 2001
From: Ruben Gees <rubengees7@googlemail.com>
Date: Wed, 9 Oct 2019 23:44:48 +0200
Subject: [PATCH] Update dependencies

---
 gradle/versions.gradle                             | 14 +++++++-------
 .../app/chat/prv/sync/MessengerNotifications.kt    |  4 ++--
 .../me/proxer/app/util/data/InstantJsonAdapter.kt  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index af38905c..c73484fe 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -17,7 +17,7 @@ ext {
 
     // Core plugins
     androidPluginVersion = "3.6.0-alpha12"
-    kotlinVersion = "1.3.50"
+    kotlinVersion = "1.3.60-eap-23"
 
     // Utility plugins
     versionsPluginVersion = "0.25.0"
@@ -29,11 +29,11 @@ ext {
     koinVersion = "2.1.0-alpha-1"
     appcompatVersion = "1.1.0"
     browserVersion = "1.2.0-alpha08"
-    lifecycleVersion = "2.2.0-alpha05"
-    roomVersion = "2.2.0-rc01"
-    workVersion = "2.3.0-alpha01"
-    coreKtxVersion = "1.2.0-alpha04"
-    fragmentKtxVersion = "1.2.0-alpha04"
+    lifecycleVersion = "2.2.0-beta01"
+    roomVersion = "2.2.0"
+    workVersion = "2.3.0-alpha02"
+    coreKtxVersion = "1.2.0-beta01"
+    fragmentKtxVersion = "1.2.0-beta01"
     shareTargetVersion = "1.0.0-beta01"
     playCoreVersion = "1.6.3"
     adsIdentifierVersion = "17.0.0"
@@ -50,7 +50,7 @@ ext {
     autoDisposeVersion = "1.2.0"
 
     // UI components
-    recyclerviewVersion = "1.1.0-beta04"
+    recyclerviewVersion = "1.1.0-beta05"
     cardviewVersion = "1.0.0"
     gridlayoutVersion = "1.0.0"
     materialComponentsVersion = "1.1.0-beta01"
diff --git a/src/main/kotlin/me/proxer/app/chat/prv/sync/MessengerNotifications.kt b/src/main/kotlin/me/proxer/app/chat/prv/sync/MessengerNotifications.kt
index 2f655d27..7692cca3 100644
--- a/src/main/kotlin/me/proxer/app/chat/prv/sync/MessengerNotifications.kt
+++ b/src/main/kotlin/me/proxer/app/chat/prv/sync/MessengerNotifications.kt
@@ -248,8 +248,8 @@ object MessengerNotifications : KoinComponent {
             .setConversationTitle(if (conference.isGroup) conference.topic else "")
             .also {
                 messages.forEach { message ->
-                    val messagePersonIcon = when {
-                        message.userId == user.id -> personImage
+                    val messagePersonIcon = when (message.userId) {
+                        user.id -> personImage
                         else -> conferenceIcon
                     }
 
diff --git a/src/main/kotlin/me/proxer/app/util/data/InstantJsonAdapter.kt b/src/main/kotlin/me/proxer/app/util/data/InstantJsonAdapter.kt
index 4e98c7e0..ef1f369d 100644
--- a/src/main/kotlin/me/proxer/app/util/data/InstantJsonAdapter.kt
+++ b/src/main/kotlin/me/proxer/app/util/data/InstantJsonAdapter.kt
@@ -10,8 +10,8 @@ import org.threeten.bp.Instant
  */
 class InstantJsonAdapter : JsonAdapter<Instant>() {
     override fun fromJson(reader: JsonReader): Instant? {
-        return when {
-            reader.peek() == JsonReader.Token.NULL -> null
+        return when (reader.peek()) {
+            JsonReader.Token.NULL -> null
             else -> Instant.ofEpochMilli(reader.nextLong())
         }
     }