Unverified Commit 49de7deb authored by Lucio Maciel's avatar Lucio Maciel Committed by GitHub

Merge pull request #785 from filipedelimabrito/chore/update-dependencies

[Chore][FIX] Update dependencies
parents df93748c c29334de
...@@ -92,10 +92,14 @@ dependencies { ...@@ -92,10 +92,14 @@ dependencies {
implementation libraries.kotshiApi implementation libraries.kotshiApi
implementation libraries.frescoImageViewer implementation libraries.frescoImageViewer
implementation libraries.androidSvg implementation (libraries.androidSvg) {
exclude group: 'org.jetbrains', module: 'annotations-java5'
}
implementation libraries.markwon implementation libraries.markwon
implementation libraries.markwonImageLoader implementation (libraries.markwonImageLoader) {
exclude group: 'com.caverock', module: 'androidsvg'
}
implementation libraries.sheetMenu implementation libraries.sheetMenu
......
...@@ -205,7 +205,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView, ...@@ -205,7 +205,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
room.readonly, room.readonly,
room.updatedAt ?: updatedAt, room.updatedAt ?: updatedAt,
timestamp, timestamp,
lastModified, lastSeen,
room.topic, room.topic,
room.announcement, room.announcement,
default, default,
...@@ -235,7 +235,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView, ...@@ -235,7 +235,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
subscription.readonly ?: readonly, subscription.readonly ?: readonly,
subscription.updatedAt ?: updatedAt, subscription.updatedAt ?: updatedAt,
subscription.timestamp ?: timestamp, subscription.timestamp ?: timestamp,
subscription.lastModified ?: lastModified, subscription.lastSeen ?: lastSeen,
topic, topic,
announcement, announcement,
subscription.isDefault, subscription.isDefault,
......
...@@ -3,10 +3,9 @@ package chat.rocket.android.helper ...@@ -3,10 +3,9 @@ package chat.rocket.android.helper
import com.crashlytics.android.Crashlytics import com.crashlytics.android.Crashlytics
import timber.log.Timber import timber.log.Timber
class CrashlyticsTree : Timber.Tree() { class CrashlyticsTree : Timber.Tree() {
override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) { override fun log(priority: Int, tag: String?, message: String, throwable: Throwable?) {
Crashlytics.log(priority, tag, message) Crashlytics.log(priority, tag, message)
if (throwable != null) { if (throwable != null) {
......
...@@ -16,13 +16,13 @@ ext { ...@@ -16,13 +16,13 @@ ext {
playServices : '11.8.0', playServices : '11.8.0',
room : '1.0.0', room : '1.0.0',
rxKotlin : '2.2.0', rxKotlin : '2.2.0',
rxAndroid : '2.0.1', rxAndroid : '2.0.2',
moshi : '1.6.0-SNAPSHOT', moshi : '1.6.0-SNAPSHOT',
okhttp : '3.9.0', okhttp : '3.9.1',
timber : '4.5.1', timber : '4.6.1',
threeTenABP : '1.0.5', threeTenABP : '1.0.5',
rxBinding : '2.0.0', rxBinding : '2.0.0',
fresco : '1.7.1', fresco : '1.8.1',
kotshi : '0.3.0', kotshi : '0.3.0',
frescoImageViewer : '0.5.0', frescoImageViewer : '0.5.0',
androidSvg : 'master-SNAPSHOT', androidSvg : 'master-SNAPSHOT',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment