Skip to content
Snippets Groups Projects
Commit 373bf08d authored by Emmanuel Bourg's avatar Emmanuel Bourg
Browse files

New upstream version 3.1.5

parent 6d2b3871
No related branches found
No related tags found
No related merge requests found
name: "Validate Gradle Wrapper"
on: [push, pull_request]
permissions:
contents: read
jobs:
validation:
name: "Validation"
......
......@@ -7,6 +7,9 @@ on:
push:
branches-ignore: [ '3.x' ]
permissions:
contents: read
jobs:
build:
......@@ -14,12 +17,12 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '8'
- name: Cache Gradle packages
uses: actions/cache@v2.1.7
uses: actions/cache@v3.0.2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
......@@ -29,6 +32,6 @@ jobs:
- name: Build RxJava
run: ./gradlew build --stacktrace
- name: Upload to Codecov
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3
- name: Generate Javadoc
run: ./gradlew javadoc --stacktrace
......@@ -9,6 +9,9 @@ on:
pull_request:
branches: [ 3.x ]
permissions:
contents: read
jobs:
build:
......@@ -16,12 +19,12 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
- name: Cache Gradle packages
uses: actions/cache@v2.1.7
uses: actions/cache@v3.0.2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
......
......@@ -7,6 +7,9 @@ on:
pull_request:
branches: [ 3.x ]
permissions:
contents: read
jobs:
build:
......@@ -14,12 +17,12 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '8'
- name: Cache Gradle packages
uses: actions/cache@v2.1.7
uses: actions/cache@v3.0.2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
......@@ -29,6 +32,6 @@ jobs:
- name: Build RxJava
run: ./gradlew build --stacktrace
- name: Upload to Codecov
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3
- name: Generate Javadoc
run: ./gradlew javadoc --stacktrace
......@@ -19,12 +19,12 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '8'
- name: Cache Gradle packages
uses: actions/cache@v2.1.7
uses: actions/cache@v3.0.2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
......@@ -38,7 +38,7 @@ jobs:
- name: Build RxJava
run: ./gradlew build --stacktrace --no-daemon
- name: Upload to Codecov
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3
- name: Upload release
run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
env:
......
......@@ -18,12 +18,12 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '8'
- name: Cache Gradle packages
uses: actions/cache@v2.1.7
uses: actions/cache@v3.0.2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
......@@ -42,7 +42,7 @@ jobs:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
- name: Upload to Codecov
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3
- name: Push Javadoc
run: ./push_javadoc.sh
# Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
......
......@@ -13,10 +13,10 @@ plugins {
}
ext {
reactiveStreamsVersion = "1.0.3"
reactiveStreamsVersion = "1.0.4"
junitVersion = "4.13.2"
testNgVersion = "7.5"
mockitoVersion = "4.4.0"
mockitoVersion = "4.6.0"
jmhLibVersion = "1.21"
guavaVersion = "31.1-jre"
}
......
......@@ -5520,7 +5520,6 @@ public abstract class Observable<@NonNull T> implements ObservableSource<T> {
* @see #blockingForEach(Consumer, int)
*/
@SchedulerSupport(SchedulerSupport.NONE)
@NonNull
public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
blockingForEach(onNext, bufferSize());
}
......@@ -5560,7 +5559,6 @@ public abstract class Observable<@NonNull T> implements ObservableSource<T> {
* @see #subscribe(Consumer)
*/
@SchedulerSupport(SchedulerSupport.NONE)
@NonNull
public final void blockingForEach(@NonNull Consumer<? super T> onNext, int capacityHint) {
Objects.requireNonNull(onNext, "onNext is null");
Iterator<T> it = blockingIterable(capacityHint).iterator();
......@@ -12036,7 +12034,6 @@ public abstract class Observable<@NonNull T> implements ObservableSource<T> {
* @throws NullPointerException if {@code observer} is {@code null}
*/
@SchedulerSupport(SchedulerSupport.NONE)
@NonNull
public final void safeSubscribe(@NonNull Observer<? super T> observer) {
Objects.requireNonNull(observer, "observer is null");
if (observer instanceof SafeObserver) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment