Build polish: bump Gradle to 6.8.3 and fix build issues (#175)

- annotation processing now must be defined using `annotationProcessor` dependency type - use archiveClassifier.set syntax - use implementation/runtime syntax for dependencies
reactor · Mar 23, 2021 · 727263a · 727263a
1 parent c25a96c
commit 727263a
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 68 deletions.
diff --git a/agent/build.gradle b/agent/build.gradle
@@ -50,26 +50,27 @@ project.tasks.jarFileTest.configure {
 tasks.check.dependsOn tasks.jarFileTest
 
 dependencies {
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc7'
+    compileOnly 'com.google.auto.service:auto-service-annotations:1.0-rc7'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
 
-    compile 'net.bytebuddy:byte-buddy:1.10.19'
-    compile 'net.bytebuddy:byte-buddy-agent:1.10.19'
+    implementation 'net.bytebuddy:byte-buddy:1.10.19'
+    implementation 'net.bytebuddy:byte-buddy-agent:1.10.19'
 
     compileOnly 'io.projectreactor:reactor-core:3.2.5.RELEASE'
     compileOnly 'io.reactivex.rxjava2:rxjava:2.2.18'
 
-    jarFileTestCompile 'org.assertj:assertj-core:3.18.1'
-    jarFileTestCompile 'junit:junit:4.13.1'
+    jarFileTestImplementation 'org.assertj:assertj-core:3.18.1'
+    jarFileTestImplementation 'junit:junit:4.13.1'
 }
 
 task sourcesJar(type: Jar) {
-    classifier 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allJava
 }
 
 task javadocJar(type: Jar) {
     from javadoc
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
 }
 
 publishing {

diff --git a/agent/src/jarFileTest/java/reactor/blockhoud/JarFileShadingTest.java b/agent/src/jarFileTest/java/reactor/blockhoud/JarFileShadingTest.java
@@ -53,8 +53,9 @@ public void testMetaInf() throws Exception {
 		);
 	}
 
+	@SuppressWarnings("unchecked")
 	private ListAssert<String> assertThatFileList(Path path) throws IOException {
-		return (ListAssert) assertThat(Files.list(path))
+		return (ListAssert<String>) assertThat(Files.list(path))
 				.extracting(Path::getFileName)
 				.extracting(Path::toString)
 				.extracting(it -> it.endsWith("/") ? it.substring(0, it.length() - 1) : it);

diff --git a/agent/src/main/java/reactor/blockhound/BlockHound.java b/agent/src/main/java/reactor/blockhound/BlockHound.java
@@ -25,6 +25,7 @@
 import net.bytebuddy.agent.builder.AgentBuilder.RedefinitionStrategy.DiscoveryStrategy;
 import net.bytebuddy.agent.builder.AgentBuilder.TypeStrategy;
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.dynamic.ClassFileLocator;
 import net.bytebuddy.matcher.ElementMatchers;
 import net.bytebuddy.pool.TypePool;
 import net.bytebuddy.pool.TypePool.CacheProvider;
@@ -98,6 +99,28 @@ private BlockHound() {
 
     }
 
+    private static final class BlockHoundPoolStrategy implements PoolStrategy {
+
+        public static final PoolStrategy INSTANCE = new BlockHoundPoolStrategy();
+
+        private BlockHoundPoolStrategy() { }
+
+        //FIXME prepare for a bump in ByteBuddy
+//        @Override
+//        public TypePool typePool(ClassFileLocator classFileLocator, ClassLoader classLoader, String name) {
+//            return typePool(classFileLocator, classLoader);
+//        }
+
+        @Override
+        public TypePool typePool(ClassFileLocator classFileLocator, ClassLoader classLoader) {
+            return new TypePool.Default(
+                    new CacheProvider.Simple(),
+                    classFileLocator,
+                    TypePool.Default.ReaderMode.FAST
+            );
+        }
+    }
+
     public static class Builder {
 
         private final Map<String, Map<String, Set<String>>> blockingMethods = new HashMap<String, Map<String, Set<String>>>() {{
@@ -473,11 +496,7 @@ private void instrument(Instrumentation instrumentation) {
                     .with(DescriptionStrategy.Default.POOL_FIRST)
                     // Override PoolStrategy because the default one will cache java.lang.Object,
                     // and we need to instrument it.
-                    .with((PoolStrategy) (classFileLocator, classLoader) -> new TypePool.Default(
-                            new CacheProvider.Simple(),
-                            classFileLocator,
-                            TypePool.Default.ReaderMode.FAST
-                    ))
+                    .with(BlockHoundPoolStrategy.INSTANCE)
                     .with(AgentBuilder.Listener.StreamWriting.toSystemError().withErrorsOnly())
 
                     // Do not ignore JDK classes

diff --git a/example/build.gradle b/example/build.gradle
@@ -26,7 +26,7 @@ test {
 
 configurations {
     reactor_3_3_x {
-        extendsFrom(testCompile, testRuntime)
+        extendsFrom(testCompile, testRuntime, testImplementation)
     }
 }
 
@@ -41,12 +41,12 @@ task testReactor3_3_x(type: Test) {
 check.dependsOn(testReactor3_3_x)
 
 dependencies {
-    testCompile project(path: ":agent", configuration: 'shadow')
-    testCompile 'io.projectreactor:reactor-core:3.2.2.RELEASE'
-    testCompile 'io.reactivex.rxjava2:rxjava:2.2.18'
+    testImplementation project(path: ":agent", configuration: 'shadow')
+    testImplementation 'io.projectreactor:reactor-core:3.2.2.RELEASE'
+    testImplementation 'io.reactivex.rxjava2:rxjava:2.2.18'
 
-    testCompile 'junit:junit:4.13.1'
-    testCompile 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.assertj:assertj-core:3.18.1'
 
     reactor_3_3_x 'io.projectreactor:reactor-core:3.3.0.RC1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; 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
 
@@ -159,14 +177,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" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/junit-platform/build.gradle b/junit-platform/build.gradle
@@ -19,29 +19,31 @@ test {
 }
 
 dependencies {
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc7'
-    compile project(path: ":agent", configuration: 'shadow')
+    compileOnly 'com.google.auto.service:auto-service-annotations:1.0-rc7'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
+
+    implementation project(path: ":agent", configuration: 'shadow')
 
     compileOnly 'org.junit.platform:junit-platform-launcher:1.0.0'
 
-    testCompile 'org.assertj:assertj-core:3.18.1'
-    testCompile 'io.projectreactor:reactor-core:3.2.2.RELEASE'
+    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'io.projectreactor:reactor-core:3.2.2.RELEASE'
 
-    testCompile 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 
     // FIXME remove once /~https://github.com/gradle/gradle/issues/8806 is fixed
-    testRuntime 'org.junit.platform:junit-platform-launcher:1.0.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.0.0'
 }
 
 task sourcesJar(type: Jar) {
-    classifier 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allJava
 }
 
 task javadocJar(type: Jar) {
     from javadoc
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
 }
 
 jar {