diff --git a/gradle.properties b/gradle.properties index c4cb586e5..960192e5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2g org.gradle.parallel=true org.gradle.caching=true -org.gradle.unsafe.configuration-cache=true \ No newline at end of file +org.gradle.configuration-cache=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba771..033e24c4c 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 bdc9a83b1..9f4197d5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d421..fcb6fca14 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# 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"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +130,13 @@ 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. + 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. @@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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 $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/src/docs/application-plugin/README.md b/src/docs/application-plugin/README.md index 1f7aa503b..896e222a9 100644 --- a/src/docs/application-plugin/README.md +++ b/src/docs/application-plugin/README.md @@ -13,7 +13,9 @@ apply plugin: 'java' apply plugin: 'application' apply plugin: 'com.github.johnrengelman.shadow' -mainClassName = 'myapp.Main' +application { + mainClass = 'myapp.Main' +} ``` ## Running the Shadow JAR diff --git a/src/main/resources/shadow-version.txt b/src/main/resources/shadow-version.txt index 8104cabd3..0e7915245 100644 --- a/src/main/resources/shadow-version.txt +++ b/src/main/resources/shadow-version.txt @@ -1 +1 @@ -8.1.0 +8.1.1 diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ApplicationSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ApplicationSpec.groovy index 04e4b78c8..87d62e81c 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ApplicationSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ApplicationSpec.groovy @@ -29,7 +29,9 @@ class ApplicationSpec extends PluginSpecification { buildFile << """ apply plugin: 'application' - mainClassName = 'myapp.Main' + application { + mainClass = 'myapp.Main' + } dependencies { implementation 'shadow:a:1.0' @@ -89,8 +91,10 @@ class ApplicationSpec extends PluginSpecification { buildFile << """ apply plugin: 'application' - - mainClassName = 'myapp.Main' + + application { + mainClass = 'myapp.Main' + } dependencies { implementation 'shadow:a:1.0' @@ -169,7 +173,9 @@ class ApplicationSpec extends PluginSpecification { buildFile << """ apply plugin: 'application' - mainClassName = 'myapp.Main' + application { + mainClass = 'myapp.Main' + } dependencies { shadow 'shadow:a:1.0' @@ -219,7 +225,9 @@ class ApplicationSpec extends PluginSpecification { buildFile << """ apply plugin: 'application' - mainClassName = 'myapp.Main' + application { + mainClass = 'myapp.Main' + } dependencies { implementation 'shadow:a:1.0' diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy index b2476e59b..e1b676d85 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy @@ -35,7 +35,9 @@ class ConfigurationCacheSpec extends PluginSpecification { buildFile << """ apply plugin: 'application' - mainClassName = 'myapp.Main' + application { + mainClass = 'myapp.Main' + } dependencies { implementation 'shadow:a:1.0' diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy index c268ffd9a..1c94ccf2a 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy @@ -1070,7 +1070,9 @@ class ShadowPluginSpec extends PluginSpecification { buildFile << """ apply plugin: 'application' - mainClassName = 'myapp.Main' + application { + mainClass = 'myapp.Main' + } dependencies { implementation 'shadow:a:1.0' @@ -1148,7 +1150,9 @@ class ShadowPluginSpec extends PluginSpecification { apply plugin: 'aspectj' apply plugin: 'application' - mainClassName = 'myapp.Main' + application { + mainClass = 'myapp.Main' + } repositories { mavenCentral()