Skip to content

3.x: Update Gradle task dependencies to remove dependsOn 'build' task #7255

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/gradle_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build branch without snapshot
run: ./gradlew -PreleaseMode=pr build --stacktrace
run: ./gradlew build --stacktrace
- name: Upload to Codecov
uses: codecov/codecov-action@v1
- name: Generate Javadocs
run: ./gradlew javadoc --stacktrace
6 changes: 3 additions & 3 deletions .github/workflows/gradle_jdk11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build PR
run: ./gradlew -PreleaseMode=pr build --stacktrace
#- name: Upload to Codecov
# uses: codecov/codecov-action@v1
run: ./gradlew build --stacktrace
- name: Generate Javadocs
run: ./gradlew javadoc --stacktrace
6 changes: 4 additions & 2 deletions .github/workflows/gradle_pr.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: PR
name: Pull Request

on:
pull_request:
Expand All @@ -27,6 +27,8 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build PR
run: ./gradlew -PreleaseMode=pr build --stacktrace
run: ./gradlew build --stacktrace
- name: Upload to Codecov
uses: codecov/codecov-action@v1
- name: Generate Javadocs
run: ./gradlew javadoc --stacktrace
2 changes: 1 addition & 1 deletion .github/workflows/gradle_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Upload to Codecov
uses: codecov/codecov-action@v1
- name: Upload release
run: ./gradlew -PreleaseMode=full javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
run: ./gradlew -PreleaseMode=full uploadArchives --no-daemon --no-parallel --stacktrace
env:
# Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
# ------------------------------------------------------------------------------
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/gradle_snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Build and Snapshot branch
run: ./gradlew -PreleaseMode=branch build --stacktrace --no-daemon
- name: Upload Snapshot
run: ./gradlew -PreleaseMode=branch javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
run: ./gradlew -PreleaseMode=branch uploadArchives --no-daemon --no-parallel --stacktrace
env:
# Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
# ------------------------------------------------------------------------------
Expand All @@ -48,4 +48,3 @@ jobs:
# ------------------------------------------------------------------------------
env:
JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}

19 changes: 13 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ group = "io.reactivex.rxjava3"
version = project.properties["VERSION_NAME"]
description = "RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM."

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

repositories {
mavenCentral()
}
Expand All @@ -57,10 +54,17 @@ dependencies {
testImplementation "com.google.guava:guava:$guavaVersion"
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

tasks.withType(JavaCompile) {
options.compilerArgs << "-parameters"
}

apply from: file("gradle/javadoc_cleanup.gradle")

javadoc {
failOnError = false
exclude "**/internal/**"
Expand All @@ -80,6 +84,8 @@ javadoc {
"https://docs.oracle.com/javase/8/docs/api/",
"http://www.reactive-streams.org/reactive-streams-${reactiveStreamsVersion}-javadoc/"
)

finalizedBy javadocCleanup
}

animalsniffer {
Expand Down Expand Up @@ -172,13 +178,16 @@ jacoco {
}

jacocoTestReport {
dependsOn test
dependsOn testng

reports {
xml.enabled = true
html.enabled = true
}
}

build.dependsOn jacocoTestReport
check.dependsOn jacocoTestReport

checkstyle {
configFile = rootProject.file("config/checkstyle/checkstyle.xml")
Expand All @@ -189,8 +198,6 @@ checkstyle {
]
}

apply from: file("gradle/javadoc_cleanup.gradle")

if (rootProject.hasProperty("releaseMode")) {
logger.lifecycle("ReleaseMode: {}", rootProject.releaseMode)

Expand Down
1 change: 0 additions & 1 deletion gradle/javadoc_cleanup.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@ def fixJavadocFile(file) {
file.setText(fileContents, 'UTF-8');
}

build.dependsOn javadocCleanup