Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ReactiveX/RxAndroid
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.1.0
Choose a base ref
...
head repository: ReactiveX/RxAndroid
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.x
Choose a head ref

Commits on Aug 16, 2018

  1. Copy the full SHA
    b315cd1 View commit details

Commits on Oct 29, 2018

  1. Fix broken license link

    ojh102 committed Oct 29, 2018
    2
    Copy the full SHA
    cde1b2b View commit details
  2. Merge pull request #447 from ojh102/fix_license_link

    Fix broken license link
    JakeWharton authored Oct 29, 2018
    Copy the full SHA
    7a4a113 View commit details

Commits on Feb 15, 2019

  1. Copy the full SHA
    7996633 View commit details
  2. Prepare version 2.1.1

    JakeWharton committed Feb 15, 2019
    Copy the full SHA
    c7a4446 View commit details
  3. Copy the full SHA
    23bf0bd View commit details
  4. Copy the full SHA
    e58f44d View commit details

Commits on Jun 21, 2019

  1. Update dependencies

        * Android Gradle plugin 3.4.1
        * Gradle 5.1.1
        * RxJava 2.2.10
    lsanotes committed Jun 21, 2019
    Copy the full SHA
    0e4e5ae View commit details
  2. Merge pull request #535 from lsanotes/2.x-AGP_3.4-RxJava_2.2.10-Gradl…

    …e_5.1.1
    
        Update dependencies
    JakeWharton authored Jun 21, 2019
    Copy the full SHA
    b01a7e2 View commit details

Commits on Sep 6, 2019

  1. Update to RxJava 3

    drewhamilton authored and JakeWharton committed Sep 6, 2019
    Copy the full SHA
    64055e2 View commit details
  2. Next version is 3.0.0

    Also the groupId has changed.
    JakeWharton authored Sep 6, 2019
    Copy the full SHA
    4a6920d View commit details
  3. 3
    Copy the full SHA
    fb3c0ae View commit details
  4. Copy the full SHA
    47bb3c1 View commit details

Commits on Sep 7, 2019

  1. Merge pull request #542 from ReactiveX/jakew/async/2019-09-06

    Make messages async by default
    JakeWharton authored Sep 7, 2019
    Copy the full SHA
    28725b5 View commit details

Commits on Sep 18, 2019

  1. RxJava 3.0 RC3

    JakeWharton committed Sep 18, 2019
    Copy the full SHA
    2d4e087 View commit details
  2. Copy the full SHA
    d7a875f View commit details

Commits on Sep 22, 2019

  1. Comment for posterity why androidx-core isn't used for async

    From personal experience, this kind of detail pointing to something Official™️ can save developers a lot of headache having to explain to skeptical colleagues.
    ZacSweers committed Sep 22, 2019
    Copy the full SHA
    3bd37aa View commit details
  2. Gradle 5.6.2

    ZacSweers committed Sep 22, 2019
    Copy the full SHA
    6f0c35a View commit details
  3. AGP 3.5.0

    ZacSweers committed Sep 22, 2019
    Copy the full SHA
    2015ee7 View commit details
  4. Compile sdk 29

    ZacSweers committed Sep 22, 2019
    Copy the full SHA
    2ad617c View commit details

Commits on Sep 23, 2019

  1. Merge pull request #544 from ZacSweers/z/commentPosterity

    Comment for posterity why androidx-core isn't used for async
    JakeWharton authored Sep 23, 2019
    Copy the full SHA
    3188e4d View commit details
  2. Merge pull request #545 from ZacSweers/z/updates

    Update project dependencies
    JakeWharton authored Sep 23, 2019
    Copy the full SHA
    b72ab92 View commit details
  3. Lowercase Androidx

    Amphasis
    ZacSweers authored Sep 23, 2019
    Copy the full SHA
    8c023a7 View commit details
  4. Merge pull request #546 from ZacSweers/patch-1

    Lowercase Androidx
    JakeWharton authored Sep 23, 2019
    Copy the full SHA
    3cca80d View commit details

Commits on Nov 23, 2019

  1. MOD: added the repository URL

    JohnE committed Nov 23, 2019
    Copy the full SHA
    c983820 View commit details

Commits on Nov 25, 2019

  1. Merge pull request #553 from j3g/readme-add-jfrog-url

    added the jfrog repository URL
    JakeWharton authored Nov 25, 2019
    Copy the full SHA
    ef3785c View commit details

Commits on Dec 31, 2019

  1. Copy the full SHA
    d7bb498 View commit details

Commits on Jan 1, 2020

  1. Merge pull request #555 from ReactiveX/jakew/java-eight/2019-12-31

    Update to RxJava RC7 and Java 8
    JakeWharton authored Jan 1, 2020
    Copy the full SHA
    72da15d View commit details

Commits on Feb 14, 2020

  1. Copy the full SHA
    d16f20b View commit details
  2. Copy the full SHA
    b80ef3e View commit details
  3. Add pull_request to Wrapper Validation Triggers

    (cherry picked from commit bcad185)
    JLLeitschuh authored and JakeWharton committed Feb 14, 2020
    Copy the full SHA
    34a62b8 View commit details
  4. Merge pull request #559 from ReactiveX/jakew/final/2020-02-14

    Prepare RxAndroid 3.0 for RxJava 3.0
    JakeWharton authored Feb 14, 2020
    Copy the full SHA
    b6dc96c View commit details
  5. Prepare version 3.0.0

    JakeWharton committed Feb 14, 2020
    1
    Copy the full SHA
    c617e3b View commit details
  6. Copy the full SHA
    faadd21 View commit details

Commits on Mar 16, 2020

  1. Fix groupId

    JakeWharton authored Mar 16, 2020
    Copy the full SHA
    802ef4b View commit details

Commits on Mar 26, 2020

  1. Update README.md

    Evin1- authored Mar 26, 2020
    Copy the full SHA
    0d63b37 View commit details

Commits on Mar 27, 2020

  1. Merge pull request #566 from Evin1-/patch-1

    Update README.md
    JakeWharton authored Mar 27, 2020
    Copy the full SHA
    cb60aef View commit details

Commits on May 2, 2020

  1. Copy the full SHA
    0020ed1 View commit details
  2. Merge pull request #568 from pwittchen/rxjava-udpate

    Updating RxJava version: 3.0.0 -> 3.0.3
    JakeWharton authored May 2, 2020
    Copy the full SHA
    0eb3973 View commit details

Commits on May 9, 2020

  1. remove unused import

    gengjiawen authored May 9, 2020
    Copy the full SHA
    52d88da View commit details
  2. Merge pull request #570 from gengjiawen/patch-1

    remove unused import
    JakeWharton authored May 9, 2020
    Copy the full SHA
    d32ba39 View commit details

Commits on Jan 7, 2021

  1. Copy the full SHA
    f1ddbcb View commit details

Commits on Feb 4, 2021

  1. Copy the full SHA
    9bdef2f View commit details

Commits on Aug 10, 2021

  1. Copy the full SHA
    6ae7453 View commit details
  2. Merge pull request #577 from gzsombor/old-android

    Enable rxAndroid usage on old Android versions
    JakeWharton authored Aug 10, 2021
    Copy the full SHA
    7d33609 View commit details

Commits on Aug 26, 2021

  1. Update gradle 6.9.1

    Goooler committed Aug 26, 2021
    Copy the full SHA
    92a63a4 View commit details
  2. Add .editorconfig

    Goooler committed Aug 26, 2021
    Copy the full SHA
    daf404c View commit details
  3. Add .gitattributes

    Goooler committed Aug 26, 2021
    Copy the full SHA
    a2ecde5 View commit details
  4. Merge pull request #582 from Goooler/gradle

    Update gradle 6.9.1 & Add configs
    JakeWharton authored Aug 26, 2021
    Copy the full SHA
    bbb97e0 View commit details

Commits on Nov 7, 2022

  1. 1
    Copy the full SHA
    09b9614 View commit details
Showing with 545 additions and 568 deletions.
  1. +11 −0 .editorconfig
  2. +4 −0 .gitattributes
  3. +7 −0 .github/dependabot.yaml
  4. +30 −0 .github/workflows/build.yaml
  5. +26 −0 .github/workflows/manual_drop.yaml
  6. +31 −0 .github/workflows/release.yaml
  7. +4 −64 .gitignore
  8. +0 −38 .travis.yml
  9. +19 −38 CHANGES.md
  10. +1 −1 CONTRIBUTING.md
  11. +36 −16 README.md
  12. +1 −3 RELEASING.md
  13. +21 −16 build.gradle
  14. +18 −4 gradle.properties
  15. +0 −68 gradle/artifacts.gradle
  16. +0 −16 gradle/buildViaTravis.sh
  17. BIN gradle/wrapper/gradle-wrapper.jar
  18. +1 −1 gradle/wrapper/gradle-wrapper.properties
  19. +33 −20 gradlew
  20. +89 −84 gradlew.bat
  21. +10 −115 rxandroid/build.gradle
  22. +1 −1 rxandroid/src/main/AndroidManifest.xml
  23. +4 −8 rxandroid/src/main/java/io/reactivex/{ → rxjava3}/android/MainThreadDisposable.java
  24. +4 −5 rxandroid/src/main/java/io/reactivex/{ → rxjava3}/android/plugins/RxAndroidPlugins.java
  25. +29 −16 rxandroid/src/main/java/io/reactivex/{ → rxjava3}/android/schedulers/AndroidSchedulers.java
  26. +12 −8 rxandroid/src/main/java/io/reactivex/{ → rxjava3}/android/schedulers/HandlerScheduler.java
  27. +2 −2 rxandroid/src/test/java/io/reactivex/{ → rxjava3}/android/MainThreadDisposableTest.java
  28. +22 −0 rxandroid/src/test/java/io/reactivex/rxjava3/android/plugins/RxAndroidPluginsNoRobolectricTest.java
  29. +6 −5 rxandroid/src/test/java/io/reactivex/{ → rxjava3}/android/plugins/RxAndroidPluginsTest.java
  30. +49 −10 rxandroid/src/test/java/io/reactivex/{ → rxjava3}/android/schedulers/AndroidSchedulersTest.java
  31. +56 −12 rxandroid/src/test/java/io/reactivex/{ → rxjava3}/android/schedulers/HandlerSchedulerTest.java
  32. +1 −1 rxandroid/src/test/java/io/reactivex/{ → rxjava3}/android/testutil/CountingRunnable.java
  33. +3 −3 rxandroid/src/test/java/io/reactivex/{ → rxjava3}/android/testutil/EmptyScheduler.java
  34. +1 −1 sample-app/build.gradle
  35. +3 −2 sample-app/src/main/AndroidManifest.xml
  36. +10 −10 sample-app/src/main/java/io/reactivex/{ → rxjava3}/android/samples/MainActivity.java
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
charset = utf-8
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[{*.yml,*.yaml}]
indent_size = 2
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
* text=auto eol=lf

*.bat text eol=crlf
*.jar binary
7 changes: 7 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2

updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
30 changes: 30 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: build

on:
pull_request: {}
push:
branches:
- '**'
tags-ignore:
- '**'

jobs:
build:
runs-on: macos-latest

steps:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v4

- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8

- run: ./gradlew build

- run: ./gradlew publish
if: ${{ github.ref == 'refs/heads/3.x' && github.repository == 'ReactiveX/RxAndroid' }}
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
26 changes: 26 additions & 0 deletions .github/workflows/manual_drop.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: 'Sonatype: manual close+release'

on:
workflow_dispatch:
inputs:
repository_name:
description: 'Name of staged repository on Sonatype'
type: string

jobs:
close_and_release:
runs-on: macos-latest

steps:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v4

- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8

- run: ./gradlew closeAndReleaseRepository --repository=${{ inputs.repository_name }}
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
31 changes: 31 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: release

on:
push:
tags:
- '**'

jobs:
release:
runs-on: macos-latest

steps:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v4

- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8

- run: ./gradlew publish
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}

- run: ./gradlew closeAndReleaseRepository
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
68 changes: 4 additions & 64 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,70 +1,10 @@
# Compiled source #
###################
*.class

# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.rar
*.tar
*.zip

# Logs and databases #
######################
*.log

# OS generated files #
######################
.DS_Store*
ehthumbs.db
Icon?
Thumbs.db

# Editor Files #
################
*~
*.swp

# Gradle Files #
################
# Gradle
.gradle
.gradletasknamecache
.m2

# Build output directies
target/
build/
build
reports

# IntelliJ specific files/directories
out
# IntelliJ
.idea
*.ipr
*.iws
*.iml
atlassian-ide-plugin.xml

# AndroidStudio specific files/directories
local.properties

# Eclipse specific files/directories
.classpath
.project
.settings
.metadata
bin/

# NetBeans specific files/directories
.nbattrs
/.nb-gradle/profiles/private/
.nb-gradle-properties

# Android
local.properties

# jEnv
.java-version
38 changes: 0 additions & 38 deletions .travis.yml

This file was deleted.

57 changes: 19 additions & 38 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,56 +1,37 @@
# RxAndroid Releases #

### Version 2.1.0 - August 16, 2018 ###
### Version 3.0.2 - November, 9 2022 ###

**API Enhancements**
Fixed:
- Ensure the main scheduler can be replaced in unit tests without needing Robolectric.

* [Pull 416](https://github.com/ReactiveX/RxAndroid/pull/416) - Add an option to post async messages

### Version 3.0.1 - November, 8 2022 ###

### Version 2.0.2 - January 12, 2018 ###
Fixed:
- `AndroidSchedulers.mainThread()` now correctly checks whether async messages are supported by the
current Android version. Previously it always assumed they were available (true on API 16+).

**API Enhancements**
Changed:
- Update to RxJava 3.1.5. This includes a transitive dependency bump to Reactive-Streams 1.0.4 which
re-licenses that dependency from CC-0 to MIT-0.

* [Pull 358](https://github.com/ReactiveX/RxAndroid/pull/358) - Add handler getters to RxAndroidPlugins

**Bugfixes**
### Version 3.0.0 - February, 14 2020 ###

* [Pull 391](https://github.com/ReactiveX/RxAndroid/pull/391) - Update scheduler error handling to match RxJava
* [Pull 408](https://github.com/ReactiveX/RxAndroid/pull/408) - Remove superfluous negative checks
* [Pull 415](https://github.com/ReactiveX/RxAndroid/pull/415) - Disable useless `BuildConfig` class generation
General availability of RxAndroid 3.0 for use with RxJava 3.0!

The Maven groupId has changed to `io.reactivex.rxjava3` and the package is now `io.reactivex.rxjava3.android`.

### Version 2.0.1 - November 12, 2016 ###
The APIs and behavior of RxAndroid 3.0.0 is otherwise exactly the same as RxAndroid 2.1.1 with one notable exception:

**Bugfixes**

* [Pull 347](https://github.com/ReactiveX/RxAndroid/pull/347) - Schedule tasks with negative delays immediately


### Version 2.0.0 - October 29, 2016 ###

General availability of RxAndroid 2.0 for use with RxJava 2.0!

The sections below contain the changes since 2.0.0-RC1.

**API Enhancements**

* [Pull 338](https://github.com/ReactiveX/RxAndroid/pull/338) - Evaluate `Schedulers` initialization via `Callable`


### Version 2.0.0-RC1 - August 25, 2016 ###

RxAndroid 2.0 has been rewritten from scratch to support RxJava 2.0.

The library still offers the same APIs: a scheduler and stream cancelation callback that know about
the main thread, a means of creating a scheduler from any `Looper`, and plugin support for the
main thread scheduler. They just reside in a new package, `io.reactivex.android`, and may have
slightly different names.

For more information about RxJava 2.0 see
[its RC1 release notes](https://github.com/ReactiveX/RxJava/releases/tag/v2.0.0-RC1)
Schedulers created via `AndroidSchedulers.from` now deliver [async messages](https://developer.android.com/reference/android/os/Handler.html#createAsync(android.os.Looper)) by default.
This is also true for `AndroidSchedulers.mainThread()`.

For more information about RxJava 3.0 see [its release notes](https://github.com/ReactiveX/RxJava/releases/tag/v3.0.0).

---

Version 2.x can be found at https://github.com/ReactiveX/RxAndroid/blob/2.x/CHANGES.md

Version 1.x can be found at https://github.com/ReactiveX/RxAndroid/blob/1.x/CHANGES.md
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ When submitting code, please make every effort to follow existing conventions an

## License

By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/ReactiveX/RxAndroid/blob/master/LICENSE
By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/ReactiveX/RxAndroid/blob/2.x/LICENSE

All files are released with the Apache 2.0 license.

Loading