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

Covariant Support with super/extends and OnSubscribeFunc #343

Merged
merged 24 commits into from
Sep 4, 2013
Merged

Covariant Support with super/extends and OnSubscribeFunc #343

merged 24 commits into from
Sep 4, 2013

Commits on Aug 31, 2013

  1. making Func0 covariant in its return type, cleaning up a few warnings… 

    …, removing a bit of unused code
    jmhofer committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    34942ad View commit details
    Browse the repository at this point in the history

  2. added variance to Func1 (hopefully) everywhere...

    jmhofer committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    52342a2 View commit details
    Browse the repository at this point in the history

  3. added variance to Func2, too

    jmhofer committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    f8cba6a View commit details
    Browse the repository at this point in the history

  4. added variance to all other Func*; this breaks Scala for good, it see… 

    …ms, as long as Observable remains invariant
    jmhofer committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    21bc549 View commit details
    Browse the repository at this point in the history

  5. added variance to Action*, too

    jmhofer committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    69c6e80 View commit details
    Browse the repository at this point in the history

  6. lots of Observer<? super X>

    jmhofer committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    0438505 View commit details
    Browse the repository at this point in the history

  7. updated to Scala 2.10.2 again, repaired Scala tests, generalized two … 

    …more zip methods
    jmhofer committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    6b9867c View commit details
    Browse the repository at this point in the history

  8. UnitTest confirming compilation failure without super/extends and suc… 

    …cess with them.

- only testing zip operator at this time
    @benjchristensen
    benjchristensen committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    6bd2033 View commit details
    Browse the repository at this point in the history

  9. Need to stay pinned on Scala 2.10.1 still … 

    I can't get through release process to maven central on 2.10.2 for some reason so pinning until that is solved.
    @benjchristensen
    benjchristensen committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    98cd711 View commit details
    Browse the repository at this point in the history

  10. Zip: Order of Generics and Artities 5-9 

    Changed order of generics on zip (and combineLatest) to match the rest of the project.
Added arties 5, 6, 7, 8, 9 to zip operator.

ReactiveX#333 Order of Generics on Zip Operator
ReactiveX#103 Add more arities to zip operator
    @benjchristensen
    benjchristensen committed Aug 31, 2013
    Configuration menu
    Copy the full SHA
    ac6a0a1 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2013

  1. Merge pull request #1 from benjchristensen/super-extends-additions 

    Zip and CombineLatest Operators: Generic Order and More Arities
    Joachim Hofer committed Sep 1, 2013
    Configuration menu
    Copy the full SHA
    ebaa616 View commit details
    Browse the repository at this point in the history

  2. adapted RxImplicits tests againt zip to new generics order, renamed t… 

    …wo more reduceFunctions to zipFunction
    jmhofer committed Sep 1, 2013
    Configuration menu
    Copy the full SHA
    a127b06 View commit details
    Browse the repository at this point in the history

  3. generalized everything in Observable that deals with covariance of ob… 

    …servables
    jmhofer committed Sep 1, 2013
    Configuration menu
    Copy the full SHA
    eba4857 View commit details
    Browse the repository at this point in the history

  4. Timestamped, Notification and Future are now also treated as covariant

    jmhofer committed Sep 1, 2013
    Configuration menu
    Copy the full SHA
    29289d1 View commit details
    Browse the repository at this point in the history

  5. added an unnecessary explicit cast because the Jenkins java compiler … 

    …is unhappy otherwise?
    jmhofer committed Sep 1, 2013
    Configuration menu
    Copy the full SHA
    78a0a1b View commit details
    Browse the repository at this point in the history

  6. Generalized all the operators, too

    jmhofer committed Sep 1, 2013
    Configuration menu
    Copy the full SHA
    1ca5900 View commit details
    Browse the repository at this point in the history

  7. generalized BlockingObservable and the execution hook further

    jmhofer committed Sep 1, 2013
    Configuration menu
    Copy the full SHA
    04f35cd View commit details
    Browse the repository at this point in the history

  8. added a few 'compiler' tests

    jmhofer committed Sep 1, 2013
    Configuration menu
    Copy the full SHA
    e962d00 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2013

  1. removed some <? super Throwable>s because that's rather unnecessary

    Joachim Hofer committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    68d181b View commit details
    Browse the repository at this point in the history

  2. Merged in master so that the gradle pull request build has a chance t… 

    …o work again
    Joachim Hofer committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    51dd848 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'super-extends' of git://github.com/jmhofer/RxJava into … 

    …covariant-support
    @benjchristensen
    benjchristensen committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    94f5fbe View commit details
    Browse the repository at this point in the history

  4. Add OnSubscribeFunction and refactor to support it 

    This is related to ongoing work related to covariant support at ReactiveX#331
    @benjchristensen
    benjchristensen committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    b7de349 View commit details
    Browse the repository at this point in the history

  5. Adding implicit for OnSubscribeFunc

    @mattrjacobs
    mattrjacobs committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    a1ad9c4 View commit details
    Browse the repository at this point in the history

  6. Change OnSubscribeFunc.call to OnSubscribeFunc.onSubscribe 

    Avoid name collions for `call` method with Func* interfaces to simplify interop with Clojure etc.
    @benjchristensen
    benjchristensen committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    3585570 View commit details
    Browse the repository at this point in the history