This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new e7aae13 bump gradle to 8.6
e7aae13 is described below
commit e7aae13b9cf1f38446e3b8312f9d9c524dec76e2
Author: Paul King <[email protected]>
AuthorDate: Thu Feb 8 18:52:08 2024 +1000
bump gradle to 8.6
---
gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 61624 bytes
gradle/wrapper/gradle-wrapper.properties | 3 ++-
gradlew | 12 ++++++++----
gradlew.bat | 1 +
site-dev/build.gradle | 8 ++++----
site-user/build.gradle | 8 ++++----
6 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index 249e583..afba109 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 068cdb2..509c4a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb..65dcd68 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-#
https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#
https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
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"'
@@ -143,12 +143,16 @@ 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=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=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
diff --git a/gradlew.bat b/gradlew.bat
index f127cfd..93e3f59 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
diff --git a/site-dev/build.gradle b/site-dev/build.gradle
index eb35f92..349d16d 100644
--- a/site-dev/build.gradle
+++ b/site-dev/build.gradle
@@ -86,7 +86,7 @@ task generateSite(type:JavaExec) {
outputs.files fileTree(outputDir)
classpath = project(':generator').sourceSets.main.runtimeClasspath
- main = 'generator.SiteGenerator'
+ mainClass = 'generator.SiteGenerator'
args = [sources, outputDir, 'sitemap-dev.groovy', project.watchmode]
systemProperties.docs_baseurl = System.getProperty('docs_baseurl')
}
@@ -130,10 +130,10 @@ task checkDeadLinks(dependsOn: generateSite) {
task webzip(type:Zip, dependsOn: checkDeadLinks) {
description = "Creates a zip with the generated website and the deadlink
report"
- destinationDir = file("$buildDir/distributions")
+ destinationDirectory = file("$buildDir/distributions")
- baseName = 'groovy'
- appendix = 'website'
+ archiveBaseName = 'groovy'
+ archiveAppendix = 'website'
from(generateSite.outputDir) {
into 'site'
}
diff --git a/site-user/build.gradle b/site-user/build.gradle
index 9d3582b..acc475d 100644
--- a/site-user/build.gradle
+++ b/site-user/build.gradle
@@ -69,7 +69,7 @@ task generateSite(type:JavaExec) {
outputs.files fileTree(outputDir)
classpath = project(':generator').sourceSets.main.runtimeClasspath
- main = 'generator.SiteGenerator'
+ mainClass = 'generator.SiteGenerator'
args = [sources, outputDir, 'sitemap-user.groovy', project.watchmode]
systemProperties.docs_baseurl = System.getProperty('docs_baseurl')
}
@@ -113,10 +113,10 @@ task checkDeadLinks(dependsOn: generateSite) {
task webzip(type:Zip, dependsOn: checkDeadLinks) {
description = "Creates a zip with the generated website and the deadlink
report"
- destinationDir = file("$buildDir/distributions")
+ destinationDirectory = file("$buildDir/distributions")
- baseName = 'groovy'
- appendix = 'website'
+ archiveBaseName = 'groovy'
+ archiveAppendix = 'website'
from(generateSite.outputDir) {
into 'site'
}
