Remove usages of rxandroid (#17688)

This commit is contained in:
arkon 2023-08-26 10:22:01 -04:00 committed by GitHub
parent 590f904086
commit a86ed92214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 20 deletions

View File

@ -19,7 +19,6 @@ coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", ve
coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines_version" }
injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version = "65b0440" }
rxandroid = { module = "io.reactivex:rxandroid", version = "1.2.1" }
rxjava = { module = "io.reactivex:rxjava", version = "1.3.8" }
jsoup = { module = "org.jsoup:jsoup", version = "1.15.1" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.11" }
@ -27,4 +26,3 @@ quickjs = { module = "app.cash.quickjs:quickjs-android", version = "0.9.2" }
[bundles]
common = ["kotlin-stdlib", "coroutines-core", "coroutines-android", "injekt-core", "rxjava", "kotlin-protobuf", "kotlin-json", "jsoup", "okhttp", "tachiyomi-lib", "quickjs"]
reactivex = ["rxandroid"]

View File

@ -6,11 +6,7 @@ ext {
extName = 'Komga'
pkgNameSuffix = 'all.komga'
extClass = '.KomgaFactory'
extVersionCode = 47
}
dependencies {
compileOnly libs.bundles.reactivex
extVersionCode = 48
}
apply from: "$rootDir/common.gradle"

View File

@ -6,11 +6,7 @@ ext {
extName = 'LANraragi'
pkgNameSuffix = 'all.lanraragi'
extClass = '.LANraragiFactory'
extVersionCode = 13
}
dependencies {
compileOnly libs.bundles.reactivex
extVersionCode = 14
}
apply from: "$rootDir/common.gradle"

View File

@ -6,12 +6,7 @@ ext {
extName = 'Suwayomi'
pkgNameSuffix = 'all.tachidesk'
extClass = '.Tachidesk'
extVersionCode = 10
}
dependencies {
implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'io.reactivex:rxjava:1.3.8'
extVersionCode = 11
}
apply from: "$rootDir/common.gradle"

View File

@ -30,7 +30,6 @@ import okhttp3.Response
import okhttp3.internal.toImmutableList
import rx.Observable
import rx.Single
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@ -206,7 +205,7 @@ class Tachidesk : ConfigurableSource, UnmeteredSource, HttpSource() {
client.newCall(GET("$baseUrl/api/v1/category", headers)).execute()
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.observeOn(Schedulers.io())
.subscribe(
{ response ->
categoryList = try {