Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RxJava from 2.2.21 to 3.1.5 #53

Merged
merged 1 commit into from
Dec 28, 2022
Merged

Update RxJava from 2.2.21 to 3.1.5 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/RxAccounts.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/RxApps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Scope
import social.bigbone.api.entity.auth.AccessToken
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/RxBlocks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/RxFavourites.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
4 changes: 2 additions & 2 deletions bigbone-rx/src/main/kotlin/social/bigbone/rx/RxFollowRequests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package social.bigbone.rx

import io.reactivex.Completable
import io.reactivex.Single
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/RxFollows.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.entity.Account
import social.bigbone.api.method.Follows
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/RxMedia.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single
import okhttp3.MultipartBody
import social.bigbone.MastodonClient
import social.bigbone.api.entity.Attachment
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/RxMutes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
4 changes: 2 additions & 2 deletions bigbone-rx/src/main/kotlin/social/bigbone/rx/RxNotifications.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package social.bigbone.rx

import io.reactivex.Completable
import io.reactivex.Single
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/RxPublic.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/RxReports.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
4 changes: 2 additions & 2 deletions bigbone-rx/src/main/kotlin/social/bigbone/rx/RxStatuses.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package social.bigbone.rx

import io.reactivex.Completable
import io.reactivex.Single
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
4 changes: 2 additions & 2 deletions bigbone-rx/src/main/kotlin/social/bigbone/rx/RxStreaming.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package social.bigbone.rx

import io.reactivex.BackpressureStrategy
import io.reactivex.Flowable
import io.reactivex.rxjava3.core.BackpressureStrategy
import io.reactivex.rxjava3.core.Flowable
import social.bigbone.MastodonClient
import social.bigbone.api.Handler
import social.bigbone.api.Shutdownable
Expand Down
3 changes: 1 addition & 2 deletions bigbone-rx/src/main/kotlin/social/bigbone/rx/RxTimelines.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package social.bigbone.rx

import io.reactivex.Single
import io.reactivex.schedulers.Schedulers.single
import io.reactivex.rxjava3.core.Single
import social.bigbone.MastodonClient
import social.bigbone.api.Pageable
import social.bigbone.api.Range
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/extensions/CompletableExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx.extensions

import io.reactivex.CompletableEmitter
import io.reactivex.rxjava3.core.CompletableEmitter

fun CompletableEmitter.onErrorIfNotDisposed(t: Throwable) {
if (!isDisposed) {
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/extensions/GlobalFunctions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx.extensions

import io.reactivex.Single
import io.reactivex.rxjava3.core.Single

fun <T> single(f: () -> T): Single<T> {
return Single.create {
Expand Down
2 changes: 1 addition & 1 deletion bigbone-rx/src/main/kotlin/social/bigbone/rx/extensions/SingleExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.rx.extensions

import io.reactivex.SingleEmitter
import io.reactivex.rxjava3.core.SingleEmitter

fun <T> SingleEmitter<T>.onErrorIfNotDisposed(t: Throwable) {
if (!isDisposed) {
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kotlin-coroutines = "1.6.4"
mockk = "1.13.3"
okhttp = "4.9.1"
okio = "2.8.0"
rxjava = "2.2.21"
rxjava = "3.1.5"

# Gradle plugins
jacoco = "0.8.8"
Expand All @@ -29,7 +29,7 @@ mockk-dsl = { module = "io.mockk:mockk-dsl", version.ref = "mockk" }
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
rxjava = { module="io.reactivex.rxjava2:rxjava", version.ref="rxjava"}
rxjava = { module="io.reactivex.rxjava3:rxjava", version.ref="rxjava"}
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }

[plugins]
Expand Down
2 changes: 1 addition & 1 deletion sample-kotlin/src/main/kotlin/social/bigbone/sample/RxStreamPublicTimeline.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package social.bigbone.sample

import io.reactivex.schedulers.Schedulers
import io.reactivex.rxjava3.schedulers.Schedulers
import social.bigbone.rx.RxStreaming

object RxStreamPublicTimeline {
Expand Down