Skip to content

Commit 2c80686

Browse files
committed
Upgrade to RxJava 3.0.0-RC7
1 parent 98a9774 commit 2c80686

19 files changed

Lines changed: 82 additions & 83 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Library to convert between RxJava 1.x and 3.x reactive types.
1717

1818
```
1919
dependencies {
20-
compile "com.github.akarnokd:rxjava3-interop:3.0.0-RC6"
20+
compile "com.github.akarnokd:rxjava3-interop:3.0.0-RC7"
2121
}
2222
```
2323

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ apply plugin: 'jacoco'
2323
apply plugin: 'ru.vyarus.animalsniffer'
2424
apply plugin: "com.github.hierynomus.license"
2525

26-
sourceCompatibility = '1.6'
27-
targetCompatibility = '1.6'
26+
sourceCompatibility = JavaVersion.VERSION_1_8
27+
targetCompatibility = JavaVersion.VERSION_1_8
2828

2929
group = "com.github.akarnokd"
3030
ext.githubProjectName = 'rxjava3-interop'
@@ -44,11 +44,11 @@ repositories {
4444
}
4545

4646
dependencies {
47-
signature 'org.codehaus.mojo.signature:java16:1.1@signature'
47+
signature 'org.codehaus.mojo.signature:java18:1.0@signature'
4848

4949
compile "org.reactivestreams:reactive-streams:1.0.3"
5050
compile "io.reactivex:rxjava:1.3.8"
51-
compile "io.reactivex.rxjava3:rxjava:3.0.0-RC6"
51+
compile "io.reactivex.rxjava3:rxjava:3.0.0-RC7"
5252

5353
testCompile group: 'junit', name: 'junit', version: '4.12'
5454
testCompile 'org.mockito:mockito-core:3.2.4'

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GROUP=com.github.akarnokd
2-
VERSION_NAME=3.0.0-RC6
3-
version=3.0.0-RC6
2+
VERSION_NAME=3.0.0-RC7
3+
version=3.0.0-RC7
44

55
POM_ARTIFACT_ID=rxjava3-interop
66
POM_NAME=Interop library between RxJava 1.x and 3.x

src/main/java/hu/akarnokd/rxjava3/interop/FlowableV3ToObservableV1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class FlowableV3ToObservableV1<T> implements rx.Observable.OnSubscribe<T>
3232

3333
@Override
3434
public void call(rx.Subscriber<? super T> t) {
35-
SourceSubscriber<T> parent = new SourceSubscriber<T>(t);
35+
SourceSubscriber<T> parent = new SourceSubscriber<>(t);
3636

3737
t.add(parent);
3838
t.setProducer(parent);

src/main/java/hu/akarnokd/rxjava3/interop/MaybeV3ToCompletableV1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ final class MaybeV3ToCompletableV1<T> implements rx.Completable.OnSubscribe {
3333

3434
@Override
3535
public void call(rx.CompletableSubscriber t) {
36-
MaybeV3Observer<T> parent = new MaybeV3Observer<T>(t);
36+
MaybeV3Observer<T> parent = new MaybeV3Observer<>(t);
3737
t.onSubscribe(parent);
3838
source.subscribe(parent);
3939
}

src/main/java/hu/akarnokd/rxjava3/interop/MaybeV3ToSingleV1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ final class MaybeV3ToSingleV1<T> implements rx.Single.OnSubscribe<T> {
3434

3535
@Override
3636
public void call(rx.SingleSubscriber<? super T> t) {
37-
MaybeV3Observer<T> parent = new MaybeV3Observer<T>(t);
37+
MaybeV3Observer<T> parent = new MaybeV3Observer<>(t);
3838
t.add(parent);
3939
source.subscribe(parent);
4040
}

src/main/java/hu/akarnokd/rxjava3/interop/ObservableV1ToFlowableV3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class ObservableV1ToFlowableV3<T> extends io.reactivex.rxjava3.core.Flowab
3131

3232
@Override
3333
protected void subscribeActual(org.reactivestreams.Subscriber<? super T> s) {
34-
ObservableSubscriber<T> parent = new ObservableSubscriber<T>(s);
34+
ObservableSubscriber<T> parent = new ObservableSubscriber<>(s);
3535
ObservableSubscriberSubscription parentSubscription = new ObservableSubscriberSubscription(parent);
3636
s.onSubscribe(parentSubscription);
3737

src/main/java/hu/akarnokd/rxjava3/interop/ObservableV1ToObservableV3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class ObservableV1ToObservableV3<T> extends io.reactivex.rxjava3.core.Obse
3131

3232
@Override
3333
protected void subscribeActual(io.reactivex.rxjava3.core.Observer<? super T> s) {
34-
ObservableSubscriber<T> parent = new ObservableSubscriber<T>(s);
34+
ObservableSubscriber<T> parent = new ObservableSubscriber<>(s);
3535
s.onSubscribe(parent);
3636

3737
source.unsafeSubscribe(parent);

src/main/java/hu/akarnokd/rxjava3/interop/ProcessorV3ToSubjectV1.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
final class ProcessorV3ToSubjectV1<T> extends rx.subjects.Subject<T, T> {
2525

2626
static <T> rx.subjects.Subject<T, T> createWith(io.reactivex.rxjava3.processors.FlowableProcessor<T> processor) {
27-
State<T> state = new State<T>(processor);
28-
return new ProcessorV3ToSubjectV1<T>(state);
27+
State<T> state = new State<>(processor);
28+
return new ProcessorV3ToSubjectV1<>(state);
2929
}
3030

3131
final State<T> state;
@@ -67,7 +67,7 @@ static final class State<T>
6767
@Override
6868
public void call(rx.Subscriber<? super T> t) {
6969
hu.akarnokd.rxjava3.interop.FlowableV3ToObservableV1.SourceSubscriber<T> parent =
70-
new hu.akarnokd.rxjava3.interop.FlowableV3ToObservableV1.SourceSubscriber<T>(t);
70+
new hu.akarnokd.rxjava3.interop.FlowableV3ToObservableV1.SourceSubscriber<>(t);
7171

7272
t.add(parent);
7373
t.setProducer(parent);

src/main/java/hu/akarnokd/rxjava3/interop/RxJavaInterop.java

Lines changed: 48 additions & 48 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)