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

Add sample operator to Flow, which can sample a Flow with the emissions of another Flow #1153

Open
wants to merge 22 commits into
base: develop
Choose a base branch
from
Open

Add sample operator to Flow, which can sample a Flow with the emissions of another Flow #1153

wants to merge 22 commits into from

Commits on Apr 27, 2019

  1. Add sample for channels and flows

    @adibfara
    adibfara committed Apr 27, 2019
    Configuration menu
    Copy the full SHA
    5aa235b View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2019

  1. Add tests for flow

    @adibfara
    adibfara committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    4a39779 View commit details
    Browse the repository at this point in the history

  2. Add tests for flow with another flow/channel

    @adibfara
    adibfara committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    cb4ae3c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into flow-sample-refactor

    @adibfara
    adibfara committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    52f68e6 View commit details
    Browse the repository at this point in the history

  4. Remove sampleBy with a ReceiveChannel since they can easily be conver… 

    …ted to flows beforehand
    @adibfara
    adibfara committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    9c94161 View commit details
    Browse the repository at this point in the history

  5. Remove sampleBy with a ReceiveChannel since they can easily be conver… 

    …ted to flows beforehand
    @adibfara
    adibfara committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    3299857 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2019

  1. Merge remote-tracking branch 'origin/master' into flow-sample-refactor

    @adibfara
    adibfara committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    1ddf6e4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from Kotlin/master 

    Update cooroutines
    @adibfara
    adibfara committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    c1176f2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into flow-sample-refactor 

    # Conflicts:
#	binary-compatibility-validator/reference-public-api/kotlinx-coroutines-core.txt
#	kotlinx-coroutines-core/common/src/flow/operators/Delay.kt
    @adibfara
    adibfara committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    0b05d11 View commit details
    Browse the repository at this point in the history

  4. Update sample usage to use flowScope 

    - remove old sample implementation
- remove old sample unit tests and add them as the new ones
    @adibfara
    adibfara committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    2aac5fc View commit details
    Browse the repository at this point in the history

  5. Update sample usage to use flowScope 

    - remove old sample implementation
- remove old sample unit tests and add them as the new ones
    @adibfara
    adibfara committed Jun 8, 2019
    Configuration menu
    Copy the full SHA
    d2ecd7d View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2020

  1. Merge pull request #3 from Kotlin/master 

    Update core coroutines
    @adibfara
    adibfara committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    a172c48 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into flow-sample-refactor 

    # Conflicts:
#	kotlinx-coroutines-core/api/kotlinx-coroutines-core.api
#	kotlinx-coroutines-core/common/src/flow/operators/Delay.kt
#	kotlinx-coroutines-core/common/test/flow/operators/SampleTest.kt
    @adibfara
    adibfara committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    26a10a2 View commit details
    Browse the repository at this point in the history

  3. Update unit tests

    @adibfara
    adibfara committed Jul 12, 2020
    Configuration menu
    Copy the full SHA
    c21baec View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2020

  1. Merge remote-tracking branch 'upstream/master' into flow-sample-refactor 

    # Conflicts:
#	kotlinx-coroutines-core/api/kotlinx-coroutines-core.api
    @adibfara
    adibfara committed Sep 25, 2020
    Configuration menu
    Copy the full SHA
    b668684 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge branch 'Kotlin:master' into master

    @adibfara
    adibfara committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    f965229 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into flow-sample-refactor 

    # Conflicts:
#	kotlinx-coroutines-core/api/kotlinx-coroutines-core.api
#	kotlinx-coroutines-core/common/src/flow/operators/Delay.kt
    @AFXtapsi
    AFXtapsi committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    3082c60 View commit details
    Browse the repository at this point in the history

  3. Update logic with master branch

    @AFXtapsi
    AFXtapsi committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    a45f5fd View commit details
    Browse the repository at this point in the history

  4. Update logic with master branch

    @AFXtapsi
    AFXtapsi committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    7b2bfee View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/flow-sample-refactor' into flow-… 

    …sample-refactor
    @AFXtapsi
    AFXtapsi committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    7812240 View commit details
    Browse the repository at this point in the history

  6. Update logic with master branch

    @AFXtapsi
    AFXtapsi committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    5d23c0d View commit details
    Browse the repository at this point in the history

  7. Update logic with master

    Adib authored and Adib committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    4a0107a View commit details
    Browse the repository at this point in the history