Skip to content

Commit 639cbc5

Browse files
2.x Initialization
- clearing out rx.* packages to start building 2.x in io.reactivex - starting fresh since the fundamental design will change to adopt ReactiveStreams interfaces and require touching virtually every file
1 parent adfabec commit 639cbc5

File tree

455 files changed

+17
-103686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

455 files changed

+17
-103686
lines changed

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@ RxJava is a Java VM implementation of [Reactive Extensions](http://reactivex.io)
44

55
It extends the [observer pattern](http://en.wikipedia.org/wiki/Observer_pattern) to support sequences of data/events and adds operators that allow you to compose sequences together declaratively while abstracting away concerns about things like low-level threading, synchronization, thread-safety and concurrent data structures.
66

7+
#### Version 2.x
8+
9+
Version 2.x and 1.x will live side-by-side for several years. They will have different namespaces (io.reactivex vs rx).
10+
11+
The purpose for 2.x is:
12+
13+
- leverage Java 8+ features
14+
- [Reactive Streams](http://www.reactive-streams.org) compatibility
15+
- performance gains through design changes learned through the 1.x cycle
16+
17+
#### Version 1.x
18+
719
- Zero Dependencies
820
- < 800KB Jar
921
- Java 6+ & [Android](https://github.com/ReactiveX/RxAndroid) 2.3+
@@ -27,6 +39,8 @@ Learn more about RxJava on the <a href="https://github.com/ReactiveX/RxJava/wiki
2739

2840
## Versioning
2941

42+
Version 2.x has started development.
43+
3044
Version 1.x is now a stable API and will be supported for several years.
3145

3246
Minor 1.x increments (such as 1.1, 1.2, etc) will occur when non-trivial new functionality is added or significant enhancements or bug fixes occur that may have behavioral changes that may affect some edge cases (such as dependence on behavior resulting from a bug). An example of an enhancement that would classify as this is adding reactive pull backpressure support to an operator that previously did not support it. This should be backwards compatible but does behave differently.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2014 Netflix, Inc.
2+
* Copyright 2015 Netflix, Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
55
* compliance with the License. You may obtain a copy of the License at
@@ -10,26 +10,8 @@
1010
* distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
1111
* the License for the specific language governing permissions and limitations under the License.
1212
*/
13-
package rx.internal.util;
13+
package io.reactivex;
1414

15-
import rx.Subscription;
16-
17-
public class SynchronizedSubscription implements Subscription {
18-
19-
private final Subscription s;
20-
21-
public SynchronizedSubscription(Subscription s) {
22-
this.s = s;
23-
}
24-
25-
@Override
26-
public synchronized void unsubscribe() {
27-
s.unsubscribe();
28-
}
29-
30-
@Override
31-
public synchronized boolean isUnsubscribed() {
32-
return s.isUnsubscribed();
33-
}
15+
public class Observable {
3416

3517
}

src/main/java/rx/Notification.java

Lines changed: 0 additions & 207 deletions
This file was deleted.

0 commit comments

Comments
 (0)