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

Sam Adapters for RxJava 2.x #114

Merged
merged 7 commits into from
May 2, 2017
Merged

Sam Adapters for RxJava 2.x #114

merged 7 commits into from
May 2, 2017

Commits on Apr 19, 2017

  1. start implementing SAM fix operators

    @thomasnield
    thomasnield committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    97ffa10 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. Add more zip() and combineLatest() 

    Add more zip() and combineLatest() functions to ObservableKt
    @thomasnield
    thomasnield committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    c84fe2e View commit details
    Browse the repository at this point in the history

  2. add more zip() and combineLatest() 

    add more zip() and combineLatest() to FlowableKt
    @thomasnield
    thomasnield committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    c193863 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2017

  1. refactor ObservableKt to Observables, FlowableKt to Flowables, etc.

    @thomasnield
    thomasnield committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    29eae30 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2017

  1. rename combineFunction to combiner

    @thomasnield
    thomasnield committed Apr 24, 2017
    Configuration menu
    Copy the full SHA
    c0906f9 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2017

  1. clean up lambda syntax on SAM helpers, update to Kotlin 1.1.2

    @thomasnield
    thomasnield committed Apr 29, 2017
    Configuration menu
    Copy the full SHA
    71c1a84 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/sam-adapters' into sam-adapters 

    # Conflicts:
#	src/main/kotlin/io/reactivex/rxkotlin/Flowables.kt
#	src/main/kotlin/io/reactivex/rxkotlin/Observables.kt
    @thomasnield
    thomasnield committed Apr 29, 2017
    Configuration menu
    Copy the full SHA
    85f31eb View commit details
    Browse the repository at this point in the history