Merge #2274 into 3.3.x

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

reactor-core/build.gradle

@@ -48,54 +48,56 @@ testSets {
 
 configurations {
 	compileOnly.extendsFrom jsr166backport
-	testCompile.extendsFrom jsr166backport
+	testCompileOnly.extendsFrom jsr166backport
 }
 
 dependencies {
 	// Reactive Streams
-	compile "org.reactivestreams:reactive-streams:${reactiveStreamsVersion}"
-	testCompile "org.reactivestreams:reactive-streams-tck:${reactiveStreamsVersion}"
+	api "org.reactivestreams:reactive-streams:${reactiveStreamsVersion}"
+	testImplementation "org.reactivestreams:reactive-streams-tck:${reactiveStreamsVersion}"
 
 	// JSR-305 annotations
-	optional "com.google.code.findbugs:jsr305:$jsr305Version"
+	compileOnly "com.google.code.findbugs:jsr305:$jsr305Version"
+	testCompileOnly "com.google.code.findbugs:jsr305:$jsr305Version"
 
 	//Optional Logging Operator
-	optional "org.slf4j:slf4j-api:$slf4jVersion"
+	compileOnly "org.slf4j:slf4j-api:$slf4jVersion"
+	testCompileOnly "org.slf4j:slf4j-api:$slf4jVersion"
 
 	//Optional Metrics
 	compileOnly "io.micrometer:micrometer-core:$micrometerVersion"
 
-	optional "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
+	implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
 
 	//Optional BlockHound support
-	optional "io.projectreactor.tools:blockhound:$blockhoundVersion"
+	compileOnly "io.projectreactor.tools:blockhound:$blockhoundVersion"
 	// Also make BlockHound visible in the CP of dedicated testset
 	blockHoundTestImplementation "io.projectreactor.tools:blockhound:$blockhoundVersion"
 
 	//Optional JDK 9 Converter
 	jsr166backport "io.projectreactor:jsr166:$jsr166BackportVersion"
 
-	testCompile "junit:junit:$jUnitVersion"
-	testCompile "org.junit.jupiter:junit-jupiter-api:${jUnitJupiterVersion}"
-	testCompile "org.junit.platform:junit-platform-launcher:1.6.1"
-	testCompile "org.junit.jupiter:junit-jupiter-params:${jUnitJupiterVersion}"
-	testRuntime "org.junit.jupiter:junit-jupiter-engine:${jUnitJupiterVersion}"
-	testRuntime "org.junit.vintage:junit-vintage-engine:${jUnitJupiterVersion}"
+	testImplementation "junit:junit:$jUnitVersion"
+	testImplementation "org.junit.jupiter:junit-jupiter-api:${jUnitJupiterVersion}"
+	testImplementation "org.junit.platform:junit-platform-launcher:1.6.1"
+	testImplementation "org.junit.jupiter:junit-jupiter-params:${jUnitJupiterVersion}"
+	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${jUnitJupiterVersion}"
+	testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${jUnitJupiterVersion}"
 
-	testRuntime "ch.qos.logback:logback-classic:$logbackVersion"
+	testRuntimeOnly "ch.qos.logback:logback-classic:$logbackVersion"
 	// Testing
-	testCompile(project(":reactor-test")) {
+	testImplementation(project(":reactor-test")) {
 		exclude module: 'reactor-core'
 	}
 
-	testCompile "org.assertj:assertj-core:$assertJVersion"
-	testCompile "org.testng:testng:$testNgVersion"
-	testCompile "org.mockito:mockito-core:$mockitoVersion"
-	testCompile "org.openjdk.jol:jol-core:$javaObjectLayoutVersion"
-	testCompile "pl.pragmatists:JUnitParams:$jUnitParamsVersion"
-	testCompile "org.awaitility:awaitility:$awaitilityVersion"
-	testCompile "com.pivovarit:throwing-function:$throwingFunctionVersion"
-	testCompile "com.tngtech.archunit:archunit:0.12.0"
+	testImplementation "org.assertj:assertj-core:$assertJVersion"
+	testImplementation "org.testng:testng:$testNgVersion"
+	testImplementation "org.mockito:mockito-core:$mockitoVersion"
+	testImplementation "org.openjdk.jol:jol-core:$javaObjectLayoutVersion"
+	testImplementation "pl.pragmatists:JUnitParams:$jUnitParamsVersion"
+	testImplementation "org.awaitility:awaitility:$awaitilityVersion"
+	testImplementation "com.pivovarit:throwing-function:$throwingFunctionVersion"
+	testImplementation "com.tngtech.archunit:archunit:0.12.0"
 
 	// withMicrometerTest is a test-set that validates what happens when micrometer *IS*
 	// on the classpath. Needs sourceSets.test.output because tests there use helpers like AutoDisposingRule etc.

reactor-test/build.gradle

@@ -36,19 +36,19 @@ ext {
 }
 
 dependencies {
-	compile project(":reactor-core")
+	api project(":reactor-core")
 
-	optional "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
+	implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
 
-	testCompile "junit:junit:$jUnitVersion"
+	testImplementation "junit:junit:$jUnitVersion"
 	testImplementation "org.junit.jupiter:junit-jupiter-api:${jUnitJupiterVersion}"
-	testRuntime "org.junit.jupiter:junit-jupiter-engine:${jUnitJupiterVersion}"
-	testRuntime "org.junit.vintage:junit-vintage-engine:${jUnitJupiterVersion}"
+	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${jUnitJupiterVersion}"
+	testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${jUnitJupiterVersion}"
 
-	testRuntime "ch.qos.logback:logback-classic:$logbackVersion"
+	testRuntimeOnly "ch.qos.logback:logback-classic:$logbackVersion"
 
-	testCompile "org.assertj:assertj-core:$assertJVersion"
-	testCompile "org.mockito:mockito-core:$mockitoVersion"
+	testImplementation "org.assertj:assertj-core:$assertJVersion"
+	testImplementation "org.mockito:mockito-core:$mockitoVersion"
 }
 
 task downloadBaseline(type: Download) {

reactor-tools/build.gradle

@@ -34,23 +34,23 @@ configurations {
 }
 
 dependencies {
-    compile project(':reactor-core')
+    implementation project(':reactor-core')
 
     shaded 'net.bytebuddy:byte-buddy-agent:1.10.9'
     shaded 'net.bytebuddy:byte-buddy:1.10.9'
     for (dependency in project.configurations.shaded.dependencies) {
         compileOnly(dependency)
-        testRuntime(dependency)
-        javaAgentTestRuntime(dependency)
+        testRuntimeOnly(dependency)
+        javaAgentTestRuntimeOnly(dependency)
     }
 
     testImplementation "org.junit.jupiter:junit-jupiter-api:${jUnitJupiterVersion}"
-    testRuntime "org.junit.jupiter:junit-jupiter-engine:${jUnitJupiterVersion}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${jUnitJupiterVersion}"
 
-    testCompile "org.assertj:assertj-core:$assertJVersion"
-    testCompile 'cglib:cglib:3.3.0'
+    testImplementation "org.assertj:assertj-core:$assertJVersion"
+    testImplementation 'cglib:cglib:3.3.0'
 
-    jarFileTestCompile 'org.assertj:assertj-core:3.12.2' //FIXME bump in root and use property
+    jarFileTestImplementation 'org.assertj:assertj-core:3.12.2' //FIXME bump in root and use property
 }
 
 test {
@@ -104,7 +104,7 @@ shadowJar {
                     .toSet()
 
             // Exclude every compile-scoped dependency (including the transitive ones)
-            for (id in project.configurations.compile.resolvedConfiguration.resolvedArtifacts*.moduleVersion*.id) {
+            for (id in project.configurations.compileClasspath.resolvedConfiguration.resolvedArtifacts*.moduleVersion*.id) {
                 def module = "${id.group}:${id.name}".toString()
                 if (!shadedDependencies.contains(module)) {
                     project.configurations.shaded.exclude(group: id.group, module: id.name)

settings.gradle

@@ -19,4 +19,7 @@ plugins {
 
 rootProject.name = 'reactor'
 
-include 'benchmarks', 'reactor-core', 'reactor-test', 'reactor-tools'
+include 'benchmarks', 'reactor-core', 'reactor-test', 'reactor-tools'
+
+// See https://docs.gradle.org/6.5.1/release-notes.html. Drop once using Gradle 7.0+
+enableFeaturePreview("VERSION_ORDERING_V2")