diff --git a/build.gradle b/build.gradle index 464440b2..bba470ea 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ configurations { def jUnitVersion = '6.1.3' dependencies { - implementation gradleApi() + compileOnly gradleApi() implementation 'org.jooq:joor:0.9.15' plugin 'com.github.javaparser:javaparser-symbol-solver-core:3.28.2' @@ -100,13 +100,14 @@ test { tasks.register('createClasspathManifest') { var outputDir = layout.buildDirectory.dir(name) - inputs.files sourceSets.main.runtimeClasspath + inputs.files sourceSets.main.runtimeClasspath, configurations.plugin outputs.dir outputDir doLast { File dir = outputDir.get().asFile dir.mkdirs() - file("$dir/plugin-classpath.txt").text = sourceSets.main.runtimeClasspath.join('\n') + file("$dir/plugin-classpath.txt").text = + (sourceSets.main.runtimeClasspath + configurations.plugin).join('\n') } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..eddabd2e 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bbb57cf0..a9cef91a 100644 --- 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-8.11-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..249efbb0 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,114 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# gradlew start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh gradlew +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -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='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; 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 # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # 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 - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -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" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..8508ef68 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,19 +13,22 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,15 +43,15 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -56,34 +59,24 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :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 %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 -:mainEnd -if "%OS%"=="Windows_NT" endlocal +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/src/main/java/org/javamodularity/moduleplugin/ModuleName.java b/src/main/java/org/javamodularity/moduleplugin/ModuleName.java index 7e56ab4b..a8513760 100644 --- a/src/main/java/org/javamodularity/moduleplugin/ModuleName.java +++ b/src/main/java/org/javamodularity/moduleplugin/ModuleName.java @@ -8,10 +8,8 @@ import org.gradle.api.UnknownDomainObjectException; import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; -import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.SourceSet; -import org.gradle.util.GradleVersion; import java.io.IOException; import java.nio.file.Files; @@ -25,17 +23,10 @@ class ModuleName { Optional findModuleName(Project project) { SourceSet main; try { - if (GradleVersion.current().compareTo(GradleVersion.version("7.1")) >= 0) { - // JavaPluginExtension#getSourceSets() is supported from Gradle 7.1 - // https://docs.gradle.org/7.1/javadoc/org/gradle/api/plugins/JavaPluginExtension.html#getSourceSets-- - JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class); - main = javaPluginExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME); - } else { - JavaPluginConvention javaConvention = project.getConvention().getPlugin(JavaPluginConvention.class); - main = javaConvention.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME); - } + JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class); + main = javaPluginExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME); } catch (IllegalStateException | UnknownDomainObjectException e) { - LOGGER.warn("Cannot obtain JavaPluginConvention", e); + LOGGER.warn("Cannot obtain JavaPluginExtension", e); return Optional.empty(); } diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/AbstractExecutionMutator.java b/src/main/java/org/javamodularity/moduleplugin/tasks/AbstractExecutionMutator.java index 831304a4..88146378 100644 --- a/src/main/java/org/javamodularity/moduleplugin/tasks/AbstractExecutionMutator.java +++ b/src/main/java/org/javamodularity/moduleplugin/tasks/AbstractExecutionMutator.java @@ -42,7 +42,7 @@ protected final String getMainClassName() { LOGGER.warn("Main module name not found. Try setting 'application.mainModule' in your Gradle build file."); mainModuleName = helper().moduleName(); } - return mainModuleName + "/" + mainClassName; + return mainModuleName + "/" + ModularJavaExec.stripModule(mainClassName); } } diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/CompileModuleInfoTask.java b/src/main/java/org/javamodularity/moduleplugin/tasks/CompileModuleInfoTask.java index a10db340..cd455c9f 100644 --- a/src/main/java/org/javamodularity/moduleplugin/tasks/CompileModuleInfoTask.java +++ b/src/main/java/org/javamodularity/moduleplugin/tasks/CompileModuleInfoTask.java @@ -98,13 +98,7 @@ private JavaCompile preconfigureCompileModuleInfoJava(JavaCompile compileJava) { compileModuleInfoJava.setSource(pathToModuleInfoJava()); compileModuleInfoJava.getOptions().setSourcepath(project.files(pathToModuleInfoJava().getParent())); - if (GradleVersion.current().compareTo(GradleVersion.version("6.1")) >= 0) { - // AbstractCompile#getDestinationDirectory() is supported from Gradle 6.1 - // https://docs.gradle.org/6.1/javadoc/org/gradle/api/tasks/compile/AbstractCompile.html#getDestinationDirectory-- - compileModuleInfoJava.getDestinationDirectory().set(helper().getModuleInfoDir()); - } else { - compileModuleInfoJava.setDestinationDir(helper().getModuleInfoDir()); - } + compileModuleInfoJava.getDestinationDirectory().set(helper().getModuleInfoDir()); // we need all the compiled classes before compiling module-info.java compileModuleInfoJava.dependsOn(compileJava); diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesHelper.java b/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesHelper.java index f44bd4fa..893f3923 100644 --- a/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesHelper.java +++ b/src/main/java/org/javamodularity/moduleplugin/tasks/MergeClassesHelper.java @@ -12,7 +12,6 @@ import org.gradle.api.tasks.compile.AbstractCompile; import org.gradle.api.tasks.compile.JavaCompile; import org.gradle.jvm.tasks.Jar; -import org.gradle.util.GradleVersion; import org.javamodularity.moduleplugin.JavaProjectHelper; import org.javamodularity.moduleplugin.extensions.CompileModuleOptions; import org.javamodularity.moduleplugin.internal.StreamHelper; @@ -129,12 +128,7 @@ public Task getTask() { @Override public File getDestinationDir() { - if (GradleVersion.current().compareTo(GradleVersion.version("6.1")) >= 0) { - // AbstractCompile#getDestinationDirectory() is supported from Gradle 6.1 - // https://docs.gradle.org/6.1/javadoc/org/gradle/api/tasks/compile/AbstractCompile.html#getDestinationDirectory-- - return task.getDestinationDirectory().get().getAsFile(); - } - return task.getDestinationDir(); + return task.getDestinationDirectory().get().getAsFile(); } @Override diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/ModularCreateStartScripts.java b/src/main/java/org/javamodularity/moduleplugin/tasks/ModularCreateStartScripts.java index f4b71eb9..b184022d 100644 --- a/src/main/java/org/javamodularity/moduleplugin/tasks/ModularCreateStartScripts.java +++ b/src/main/java/org/javamodularity/moduleplugin/tasks/ModularCreateStartScripts.java @@ -2,17 +2,18 @@ import org.gradle.api.GradleException; import org.gradle.api.Project; -import org.gradle.api.plugins.ApplicationPluginConvention; import org.gradle.api.plugins.JavaApplication; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.application.CreateStartScripts; +import org.gradle.work.DisableCachingByDefault; import javax.annotation.Nullable; import java.io.File; import java.util.ArrayList; -public class ModularCreateStartScripts extends CreateStartScripts { +@DisableCachingByDefault(because = "Not worth caching, as with the CreateStartScripts task it extends") +public abstract class ModularCreateStartScripts extends CreateStartScripts { public static final String UNDEFINED_MAIN_CLASS_NAME = ""; private String changedMain; @@ -29,7 +30,7 @@ public ModularCreateStartScripts() { public String getMainClassName() { String main = changedMain; if(main == null) { - main = super.getMainClass().getOrNull(); + main = getMainClass().getOrNull(); } if(main == null) { main = UNDEFINED_MAIN_CLASS_NAME; diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/ModularJavaExec.java b/src/main/java/org/javamodularity/moduleplugin/tasks/ModularJavaExec.java index 615b62df..64fbdbde 100644 --- a/src/main/java/org/javamodularity/moduleplugin/tasks/ModularJavaExec.java +++ b/src/main/java/org/javamodularity/moduleplugin/tasks/ModularJavaExec.java @@ -12,6 +12,7 @@ import org.gradle.process.CommandLineArgumentProvider; import org.gradle.process.ExecResult; import org.gradle.util.GradleVersion; +import org.gradle.work.DisableCachingByDefault; import org.javamodularity.moduleplugin.JavaProjectHelper; import java.util.ArrayList; @@ -20,7 +21,8 @@ import static org.joor.Reflect.on; import static org.joor.Reflect.onClass; -public class ModularJavaExec extends JavaExec { +@DisableCachingByDefault(because = "Application execution should not be cached, as with the JavaExec task it extends") +public abstract class ModularJavaExec extends JavaExec { private static final Logger LOGGER = Logging.getLogger(ModularJavaExec.class); @Internal @@ -74,7 +76,7 @@ public JavaExec setMain(String mainClassName) { return this; } - private static String stripModule(String main) { + static String stripModule(String main) { if(main == null) return main; int idx = main.indexOf('/'); return (idx < 0) ? main : main.substring(idx + 1); diff --git a/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java b/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java index e8bcf905..e7cdfae8 100644 --- a/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java +++ b/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java @@ -35,7 +35,7 @@ class ModulePluginSmokeTest { @SuppressWarnings("unused") private enum GradleVersion { v8_11, v8_14_3, - v9_0, v9_4_1 + v9_0, v9_7_1 ; @Override @@ -279,7 +279,30 @@ void smokeTestRunStartScripts( @Test void shouldNotCheckInWithCommentedOutVersions() { - assertEquals(4, GradleVersion.values().length); + assertEquals(5, GradleVersion.values().length); + } + + @Test + void pluginClasspathShouldNotContainTheGradleApi() { + assertTrue( + pluginClasspath.stream().noneMatch(file -> file.getName().startsWith("gradle-api-")), + () -> "The Gradle API must stay off the plugin classpath: each Gradle under test supplies " + + "its own, and shipping ours puts that version's bytecode in front of every other " + + "version. gradle-api-9.7.1.jar holds class files at major version 69, which " + + "Gradle below 9.2 cannot instrument, failing every smoke test on the older " + + "versions with 'Unsupported class file major version 69'. Classpath was: " + + pluginClasspath); + } + + @Test + void pluginClasspathShouldContainJavaParser() { + assertTrue( + pluginClasspath.stream().anyMatch(file -> file.getName().startsWith("javaparser-core")), + () -> "javaparser is a runtime dependency of the plugin and reached TestKit only as a " + + "passenger of the Gradle API, so it has to be put on the classpath explicitly. " + + "Without it every build under test fails with " + + "NoClassDefFoundError: com/github/javaparser/JavaParser. Classpath was: " + + pluginClasspath); } private static void assertTasksSuccessful(BuildResult result, String subprojectName, String... taskNames) { diff --git a/src/test/java/org/javamodularity/moduleplugin/tasks/AbstractExecutionMutatorTest.java b/src/test/java/org/javamodularity/moduleplugin/tasks/AbstractExecutionMutatorTest.java new file mode 100644 index 00000000..9ecddf16 --- /dev/null +++ b/src/test/java/org/javamodularity/moduleplugin/tasks/AbstractExecutionMutatorTest.java @@ -0,0 +1,66 @@ +package org.javamodularity.moduleplugin.tasks; + +import org.gradle.api.Project; +import org.gradle.api.tasks.JavaExec; +import org.gradle.testfixtures.ProjectBuilder; +import org.junit.jupiter.api.Test; + +import java.io.File; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +class AbstractExecutionMutatorTest { + + private static final String MODULE = "greeter.startscripts"; + private static final String MAIN_CLASS = "startscripts.Demo1"; + + @Test + void mainClassNameIsQualifiedWithTheMainModule() { + JavaExec execTask = execTask(MAIN_CLASS); + + assertEquals(MODULE + "/" + MAIN_CLASS, mutatorFor(execTask).getMainClassName()); + } + + @Test + void alreadyQualifiedMainClassIsNotQualifiedTwice() { + JavaExec execTask = execTask(MODULE + "/" + MAIN_CLASS); + + assertEquals(MODULE + "/" + MAIN_CLASS, mutatorFor(execTask).getMainClassName(), + "mainClass can arrive already module-qualified: ModularJavaExec.setMain() strips the " + + "prefix, but it is not always the setter that runs. Compiled against Gradle 9, " + + "where JavaExecSpec.setMain(String) no longer exists, javac emits no covariant " + + "bridge for the override, so on Gradle 8.x a Groovy DSL `main = \"module/Class\"` " + + "assignment reaches Gradle's own setMain instead. Qualifying twice yields " + + "`--module module/module/Class`, and the JVM then fails with " + + "\"Could not find or load main class module/Class in module module\"."); + } + + @Test + void setMainStripsTheModulePrefix() { + ModularJavaExec execTask = ProjectBuilder.builder() + .withProjectDir(new File("test-project/greeter.startscripts/")).build() + .getTasks().create("run", ModularJavaExec.class); + + execTask.setMain(MODULE + "/" + MAIN_CLASS); + + assertEquals(MAIN_CLASS, execTask.getMain(), + "setMain() stores the bare class name so that the module is applied exactly once, " + + "by getMainClassName()"); + } + + private static JavaExec execTask(String mainClass) { + Project project = ProjectBuilder.builder() + .withProjectDir(new File("test-project/greeter.startscripts/")).build(); + project.getPlugins().apply("java"); + + JavaExec execTask = project.getTasks().create("run", JavaExec.class); + execTask.getMainClass().set(mainClass); + execTask.getMainModule().set(MODULE); + return execTask; + } + + private static AbstractExecutionMutator mutatorFor(JavaExec execTask) { + return new AbstractExecutionMutator(execTask, execTask.getProject()) { + }; + } +}