Skip to content

Commit

Permalink
Merge pull request #168 from hermanbanken/0.x
Browse files Browse the repository at this point in the history
Move examples
  • Loading branch information
zsxwing committed Jun 1, 2015
2 parents b8beb0c + 28aa94b commit 4857c77
Show file tree
Hide file tree
Showing 12 changed files with 1,700 additions and 1,698 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ o1.switchIfEmpty(alternate).foreach(println)
o2.switchIfEmpty(alternate).foreach(println)
```

See more examples in [ExperimentalAPIExamples](/~https://github.com/ReactiveX/RxScala/blob/0.x/examples/src/test/scala/rx/lang/scala/examples/ExperimentalAPIExamples.scala)
See more examples in [ExperimentalAPIExamples](/~https://github.com/ReactiveX/RxScala/blob/0.x/examples/src/test/scala/examples/ExperimentalAPIExamples.scala)

Because the APIs in ExperimentalAPIs depends on unstable APIs in RxJava, if you would like to use a custom RxJava version,
it's better to check the compatibility in /~https://github.com/ReactiveX/RxScala#versioning
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def never: Observable[Nothing]

Also, the Scala Observable is fully covariant in its type parameter, whereas the Java Observable only achieves partial covariance due to limitations of Java's type system (or if you can fix this, your suggestions are very welcome).

For more examples, see [RxScalaDemo.scala](/~https://github.com/ReactiveX/RxScala/blob/0.x/examples/src/test/scala/rx/lang/scala/examples/RxScalaDemo.scala).
For more examples, see [RxScalaDemo.scala](/~https://github.com/ReactiveX/RxScala/blob/0.x/examples/src/test/scala/examples/RxScalaDemo.scala).

Scala code using Rx should only import members from `rx.lang.scala` and below.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package rx.lang.scala.examples;
package examples;

import rx.Observable;
import rx.functions.Action1;
import rx.lang.scala.examples.Movie;
import rx.lang.scala.examples.MovieLib;
import static rx.lang.scala.JavaConversions.toScalaObservable;

public class MovieLibUsage {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package rx.lang.scala.examples
package examples

import scala.collection.mutable

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package rx.lang.scala.examples
package examples

import scala.concurrent.duration._
import scala.language.postfixOps
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package rx.lang.scala.examples
package examples

import rx.lang.scala.Observable

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package rx.lang.scala.examples
package examples

import rx.lang.scala.Observable
import scala.concurrent.duration._
Expand Down
Loading

0 comments on commit 4857c77

Please sign in to comment.