Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 15:01:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor dependency updates

Browse Source
This commit is contained in:
arkon 2021-01-23 13:23:49 -05:00
parent e288bf902b
commit 7cae3095c4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -144,7 +144,7 @@ dependencies {
// UI library // UI library
implementation("com.google.android.material:material:1.3.0-rc01") implementation("com.google.android.material:material:1.3.0-rc01")
"standardImplementation"("com.google.firebase:firebase-core:18.0.0") "standardImplementation"("com.google.firebase:firebase-core:18.0.1")
// ReactiveX // ReactiveX
implementation("io.reactivex:rxandroid:1.2.1") implementation("io.reactivex:rxandroid:1.2.1")
@ -248,7 +248,7 @@ dependencies {
implementation("com.mikepenz:aboutlibraries:${BuildPluginsVersion.ABOUTLIB_PLUGIN}") implementation("com.mikepenz:aboutlibraries:${BuildPluginsVersion.ABOUTLIB_PLUGIN}")
// Tests // Tests
testImplementation("junit:junit:4.13") testImplementation("junit:junit:4.13.1")
testImplementation("org.assertj:assertj-core:3.16.1") testImplementation("org.assertj:assertj-core:3.16.1")
testImplementation("org.mockito:mockito-core:1.10.19") testImplementation("org.mockito:mockito-core:1.10.19")

4
app/src/main/java/eu/kanade/tachiyomi/util/lang/RxExtensions.kt
View File

@ -11,7 +11,3 @@ operator fun CompositeSubscription.plusAssign(subscription: Subscription) = add(
fun <T, U, R> Observable<T>.combineLatest(o2: Observable<U>, combineFn: (T, U) -> R): Observable<R> { fun <T, U, R> Observable<T>.combineLatest(o2: Observable<U>, combineFn: (T, U) -> R): Observable<R> {
return Observable.combineLatest(this, o2, combineFn) return Observable.combineLatest(this, o2, combineFn)
} }
fun Subscription.addTo(subscriptions: CompositeSubscription) {
subscriptions.add(this)
}