MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove RxJava as dependency

Browse Source
This commit is contained in:
topjohnwu 2020-07-10 23:06:41 -07:00
parent 52d19d3ea2
commit 7873433977
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle.kts
View File

@ -77,10 +77,6 @@ dependencies {
implementation("com.github.topjohnwu:jtar:1.0.0") implementation("com.github.topjohnwu:jtar:1.0.0")
implementation("com.jakewharton.timber:timber:4.7.1") implementation("com.jakewharton.timber:timber:4.7.1")
implementation("io.reactivex.rxjava2:rxjava:2.2.19")
implementation("io.reactivex.rxjava2:rxkotlin:2.4.0")
implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
implementation("org.jetbrains.kotlin:kotlin-stdlib:${Deps.vKotlin}") implementation("org.jetbrains.kotlin:kotlin-stdlib:${Deps.vKotlin}")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Deps.vKotlin}") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${Deps.vKotlin}")
@ -108,7 +104,6 @@ dependencies {
implementation("com.squareup.retrofit2:retrofit:${vRetrofit}") implementation("com.squareup.retrofit2:retrofit:${vRetrofit}")
implementation("com.squareup.retrofit2:converter-moshi:${vRetrofit}") implementation("com.squareup.retrofit2:converter-moshi:${vRetrofit}")
implementation("com.squareup.retrofit2:converter-scalars:${vRetrofit}") implementation("com.squareup.retrofit2:converter-scalars:${vRetrofit}")
implementation("com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}")
val vOkHttp = "3.12.12" val vOkHttp = "3.12.12"
implementation("com.squareup.okhttp3:okhttp") { implementation("com.squareup.okhttp3:okhttp") {
@ -132,7 +127,7 @@ dependencies {
implementation("androidx.navigation:navigation-ui-ktx:${Deps.vNav}") implementation("androidx.navigation:navigation-ui-ktx:${Deps.vNav}")
implementation("androidx.biometric:biometric:1.0.1") implementation("androidx.biometric:biometric:1.0.1")
implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta7") implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta8")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("androidx.browser:browser:1.2.0") implementation("androidx.browser:browser:1.2.0")
implementation("androidx.preference:preference:1.1.1") implementation("androidx.preference:preference:1.1.1")

2
app/src/main/java/com/topjohnwu/magisk/di/NetworkingModule.kt
View File

@ -18,7 +18,6 @@ import okhttp3.OkHttpClient
import okhttp3.dnsoverhttps.DnsOverHttps import okhttp3.dnsoverhttps.DnsOverHttps
import org.koin.dsl.module import org.koin.dsl.module
import retrofit2.Retrofit import retrofit2.Retrofit
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
import retrofit2.converter.moshi.MoshiConverterFactory import retrofit2.converter.moshi.MoshiConverterFactory
import retrofit2.converter.scalars.ScalarsConverterFactory import retrofit2.converter.scalars.ScalarsConverterFactory
import java.net.InetAddress import java.net.InetAddress
@ -81,7 +80,6 @@ fun createRetrofit(okHttpClient: OkHttpClient): Retrofit.Builder {
return Retrofit.Builder() return Retrofit.Builder()
.addConverterFactory(ScalarsConverterFactory.create()) .addConverterFactory(ScalarsConverterFactory.create())
.addConverterFactory(createMoshiConverterFactory()) .addConverterFactory(createMoshiConverterFactory())
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
.client(okHttpClient) .client(okHttpClient)
} }

1
app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
View File

@ -16,7 +16,6 @@ import com.topjohnwu.magisk.view.MagiskDialog
import com.topjohnwu.magisk.view.MarkDownWindow import com.topjohnwu.magisk.view.MarkDownWindow
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
import dalvik.system.DexFile import dalvik.system.DexFile
import io.reactivex.subjects.PublishSubject
import kotlinx.coroutines.* import kotlinx.coroutines.*
import org.json.JSONObject import org.json.JSONObject
import org.koin.core.KoinComponent import org.koin.core.KoinComponent