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

Jump to bottom

Creating Observables in Scala: Approach04 #561

Merged
merged 5 commits into from
Dec 5, 2013
Merged

Creating Observables in Scala: Approach04 #561

merged 5 commits into from
Dec 5, 2013

Commits on Dec 4, 2013

  1. replace Observable.apply(rx.Observable) by toScalaObservable 

    and move Java types <=> Scala types conversions from
ImplicitFunctionConversions to JavaConversions
    @samuelgruetter
    samuelgruetter committed Dec 4, 2013
    Configuration menu
    Copy the full SHA
    bc1daa7 View commit details
    Browse the repository at this point in the history

  2. rename Observable constructors

    @samuelgruetter
    samuelgruetter committed Dec 4, 2013
    Configuration menu
    Copy the full SHA
    6ce1a45 View commit details
    Browse the repository at this point in the history

  3. add equals, hashCode, toString to Notifications

    @samuelgruetter
    samuelgruetter committed Dec 4, 2013
    Configuration menu
    Copy the full SHA
    b37a0ad View commit details
    Browse the repository at this point in the history

  4. add Observable.from(Future) constructor

    @samuelgruetter
    samuelgruetter committed Dec 4, 2013
    Configuration menu
    Copy the full SHA
    b8418f1 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2013

  1. Manually merge branch 'master' of github.com:Netflix/RxJava into scal… 

    …a-constructors

Conflicts:
	language-adaptors/rxjava-scala/src/examples/scala/rx/lang/scala/examples/RxScalaDemo.scala
	language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/ImplicitFunctionConversions.scala
	language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala
    @samuelgruetter
    samuelgruetter committed Dec 5, 2013
    Configuration menu
    Copy the full SHA
    4df4cca View commit details
    Browse the repository at this point in the history