Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
d295d6b8
Commit
d295d6b8
authored
Aug 29, 2018
by
Lucio Maciel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update libs to latest version
parent
962d03cf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
19 deletions
+21
-19
build.gradle
app/build.gradle
+4
-3
ChatRoomsViewModel.kt
.../rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt
+3
-3
WrappedLiveData.kt
...java/chat/rocket/android/util/livedata/WrappedLiveData.kt
+0
-3
dependencies.gradle
dependencies.gradle
+14
-10
No files found.
app/build.gradle
View file @
d295d6b8
...
@@ -6,6 +6,7 @@ if (isPlay) { apply plugin: 'io.fabric' }
...
@@ -6,6 +6,7 @@ if (isPlay) { apply plugin: 'io.fabric' }
apply
plugin:
'kotlin-android'
apply
plugin:
'kotlin-android'
apply
plugin:
'kotlin-android-extensions'
apply
plugin:
'kotlin-android-extensions'
apply
plugin:
'kotlin-kapt'
apply
plugin:
'kotlin-kapt'
apply
plugin:
"com.github.ben-manes.versions"
android
{
android
{
compileSdkVersion
versions
.
compileSdk
compileSdkVersion
versions
.
compileSdk
...
@@ -145,14 +146,14 @@ dependencies {
...
@@ -145,14 +146,14 @@ dependencies {
implementation
libraries
.
aVLoadingIndicatorView
implementation
libraries
.
aVLoadingIndicatorView
implementation
"com.github.luciofm:livedata-ktx:b1e8bbc25a"
implementation
libraries
.
livedataKtx
// Proprietary libraries
// Proprietary libraries
playImplementation
libraries
.
fcm
playImplementation
libraries
.
fcm
playImplementation
libraries
.
firebaseAnalytics
playImplementation
libraries
.
firebaseAnalytics
playImplementation
libraries
.
playServicesAuth
playImplementation
libraries
.
playServicesAuth
playImplementation
(
'com.crashlytics.sdk.android:crashlytics:2.9.
4
@aar'
)
{
transitive
=
true
}
playImplementation
(
'com.crashlytics.sdk.android:crashlytics:2.9.
5
@aar'
)
{
transitive
=
true
}
playImplementation
(
'com.crashlytics.sdk.android:answers:1.4.
2
@aar'
)
{
transitive
=
true
}
playImplementation
(
'com.crashlytics.sdk.android:answers:1.4.
3
@aar'
)
{
transitive
=
true
}
testImplementation
libraries
.
junit
testImplementation
libraries
.
junit
testImplementation
libraries
.
truth
testImplementation
libraries
.
truth
...
...
app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt
View file @
d295d6b8
...
@@ -17,15 +17,15 @@ import chat.rocket.common.util.ifNull
...
@@ -17,15 +17,15 @@ import chat.rocket.common.util.ifNull
import
chat.rocket.core.internal.realtime.socket.model.State
import
chat.rocket.core.internal.realtime.socket.model.State
import
chat.rocket.core.internal.rest.spotlight
import
chat.rocket.core.internal.rest.spotlight
import
chat.rocket.core.model.SpotlightResult
import
chat.rocket.core.model.SpotlightResult
import
com.shopify.livedataktx.distinct
import
com.shopify.livedataktx.map
import
com.shopify.livedataktx.nonNull
import
kotlinx.coroutines.experimental.android.UI
import
kotlinx.coroutines.experimental.android.UI
import
kotlinx.coroutines.experimental.delay
import
kotlinx.coroutines.experimental.delay
import
kotlinx.coroutines.experimental.isActive
import
kotlinx.coroutines.experimental.isActive
import
kotlinx.coroutines.experimental.launch
import
kotlinx.coroutines.experimental.launch
import
kotlinx.coroutines.experimental.newSingleThreadContext
import
kotlinx.coroutines.experimental.newSingleThreadContext
import
kotlinx.coroutines.experimental.withContext
import
kotlinx.coroutines.experimental.withContext
import
me.henrytao.livedataktx.distinct
import
me.henrytao.livedataktx.map
import
me.henrytao.livedataktx.nonNull
import
timber.log.Timber
import
timber.log.Timber
import
java.security.InvalidParameterException
import
java.security.InvalidParameterException
import
kotlin.coroutines.experimental.coroutineContext
import
kotlin.coroutines.experimental.coroutineContext
...
...
app/src/main/java/chat/rocket/android/util/livedata/WrappedLiveData.kt
View file @
d295d6b8
...
@@ -4,11 +4,8 @@ import androidx.lifecycle.LiveData
...
@@ -4,11 +4,8 @@ import androidx.lifecycle.LiveData
import
androidx.lifecycle.MutableLiveData
import
androidx.lifecycle.MutableLiveData
import
androidx.lifecycle.Observer
import
androidx.lifecycle.Observer
import
kotlinx.coroutines.experimental.CommonPool
import
kotlinx.coroutines.experimental.CommonPool
import
kotlinx.coroutines.experimental.CoroutineScope
import
kotlinx.coroutines.experimental.Job
import
kotlinx.coroutines.experimental.Job
import
kotlinx.coroutines.experimental.android.UI
import
kotlinx.coroutines.experimental.launch
import
kotlinx.coroutines.experimental.launch
import
kotlinx.coroutines.experimental.withContext
import
kotlin.coroutines.experimental.CoroutineContext
import
kotlin.coroutines.experimental.CoroutineContext
class
WrappedLiveData
<
Source
,
Output
>(
class
WrappedLiveData
<
Source
,
Output
>(
...
...
dependencies.gradle
View file @
d295d6b8
...
@@ -10,7 +10,7 @@ ext {
...
@@ -10,7 +10,7 @@ ext {
// For app
// For app
kotlin
:
'1.2.61'
,
kotlin
:
'1.2.61'
,
coroutine
:
'0.2
4
.0'
,
coroutine
:
'0.2
5
.0'
,
appCompat
:
'1.0.0-rc02'
,
appCompat
:
'1.0.0-rc02'
,
recyclerview
:
'1.0.0-rc02'
,
recyclerview
:
'1.0.0-rc02'
,
...
@@ -20,18 +20,20 @@ ext {
...
@@ -20,18 +20,20 @@ ext {
androidKtx
:
'1.0.0-rc02'
,
androidKtx
:
'1.0.0-rc02'
,
dagger
:
'2.16'
,
dagger
:
'2.16'
,
firebaseCloudMessage
:
'17.
1
.0'
,
firebaseCloudMessage
:
'17.
3
.0'
,
firebaseAnalytics
:
'16.0.
1
'
,
firebaseAnalytics
:
'16.0.
3
'
,
playServices
:
'1
5.0.1
'
,
playServices
:
'1
6.0.0
'
,
exoPlayer
:
'2.8.2'
,
exoPlayer
:
'2.8.2'
,
flexbox
:
'1.0.0'
,
flexbox
:
'1.0.0'
,
material
:
'1.0.0-rc01'
,
material
:
'1.0.0-rc01'
,
room
:
'2.0.0-
beta
01'
,
room
:
'2.0.0-
rc
01'
,
lifecycle
:
'2.0.0-
beta
01'
,
lifecycle
:
'2.0.0-
rc
01'
,
rxKotlin
:
'2.2.0'
,
livedataKtx
:
'2.0.1'
,
rxAndroid
:
'2.0.2'
,
rxKotlin
:
'2.3.0'
,
rxAndroid
:
'2.1.0'
,
moshi
:
'1.6.0'
,
moshi
:
'1.6.0'
,
okhttp
:
'3.11.0'
,
okhttp
:
'3.11.0'
,
...
@@ -45,9 +47,9 @@ ext {
...
@@ -45,9 +47,9 @@ ext {
kotshi
:
'1.0.4'
,
kotshi
:
'1.0.4'
,
frescoImageViewer
:
'0.5.1'
,
frescoImageViewer
:
'0.5.1'
,
markwon
:
'1.1.
0
'
,
markwon
:
'1.1.
1
'
,
aVLoadingIndicatorView:
'2.1.3'
,
aVLoadingIndicatorView:
'2.1.3'
,
glide
:
'4.8.0
-SNAPSHOT
'
,
glide
:
'4.8.0'
,
// For wearable
// For wearable
wear
:
'2.3.0'
,
wear
:
'2.3.0'
,
...
@@ -85,6 +87,8 @@ ext {
...
@@ -85,6 +87,8 @@ ext {
lifecycleExtensions
:
"androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}"
,
lifecycleExtensions
:
"androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}"
,
lifecycleCompiler
:
"androidx.lifecycle:lifecycle-compiler:${versions.lifecycle}"
,
lifecycleCompiler
:
"androidx.lifecycle:lifecycle-compiler:${versions.lifecycle}"
,
livedataKtx
:
"com.shopify:livedata-ktx:${versions.livedataKtx}"
,
rxKotlin
:
"io.reactivex.rxjava2:rxkotlin:${versions.rxKotlin}"
,
rxKotlin
:
"io.reactivex.rxjava2:rxkotlin:${versions.rxKotlin}"
,
rxAndroid
:
"io.reactivex.rxjava2:rxandroid:${versions.rxAndroid}"
,
rxAndroid
:
"io.reactivex.rxjava2:rxandroid:${versions.rxAndroid}"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment