You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2023/01/25 04:02:32 UTC
[groovy-website] branch asf-site updated: use later gradle version
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 3077a6f use later gradle version
3077a6f is described below
commit 3077a6fcbc3f7736fcf09d9c54539d131e777bf4
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Jan 25 14:02:26 2023 +1000
use later gradle version
---
buildSrc/build.gradle | 4 ++--
generator/build.gradle | 12 ++++++------
gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 59203 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 2 ++
gradlew.bat | 25 +++++++------------------
6 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 507f736..0fefbd4 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -22,6 +22,6 @@ repositories {
}
dependencies {
- compile 'org.apache.httpcomponents:httpclient:4.5.1'
- compile 'com.yahoo.platform.yui:yuicompressor:2.4.7'
+ implementation 'org.apache.httpcomponents:httpclient:4.5.1'
+ implementation 'com.yahoo.platform.yui:yuicompressor:2.4.7'
}
diff --git a/generator/build.gradle b/generator/build.gradle
index 2267afa..040c2f0 100644
--- a/generator/build.gradle
+++ b/generator/build.gradle
@@ -24,13 +24,13 @@ repositories {
}
dependencies {
- ext.groovyVersion = '2.5.9'
+ ext.groovyVersion = '3.0.14'
ext.asciidocVersion = '2.2.0'
- compile "org.codehaus.groovy:groovy:$groovyVersion"
- compile "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
- compile "org.codehaus.groovy:groovy-json:$groovyVersion"
- compile "org.codehaus.groovy:groovy-templates:$groovyVersion"
- compile("org.asciidoctor:asciidoctorj:$asciidocVersion") {
+ implementation "org.codehaus.groovy:groovy:$groovyVersion"
+ implementation "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
+ implementation "org.codehaus.groovy:groovy-json:$groovyVersion"
+ implementation "org.codehaus.groovy:groovy-templates:$groovyVersion"
+ implementation("org.asciidoctor:asciidoctorj:$asciidocVersion") {
// to fix intermittent errors, e.g. as described here:
// https://github.com/asciidoctor/asciidoctorj/issues/680
// you might need to use a custom jruby version
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1..e708b1c 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 442d913..ae04661 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-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7..4f906e0 100755
--- a/gradlew
+++ b/gradlew
@@ -82,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
@@ -129,6 +130,7 @@ fi
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
diff --git a/gradlew.bat b/gradlew.bat
index 24467a1..ac1b06f 100644
--- a/gradlew.bat
+++ b/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"
@@ -37,7 +40,7 @@ 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.
@@ -51,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%
@@ -61,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