Revision | 4c8732df4a41a16fd592f422f4db69148fbee12b (tree) |
---|---|
Time | 2023-10-19 00:07:53 |
Author | PokeMMO <2398581+PokeMMO@user...> |
Commiter | GitHub |
Merge pull request #47 from SimonIT/gradle-upgrade
chore: Update gradle wrapper to 8.4
@@ -1,6 +1,7 @@ | ||
1 | 1 | distributionBase=GRADLE_USER_HOME |
2 | 2 | distributionPath=wrapper/dists |
3 | -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip | |
4 | -distributionSha256Sum=0f316a67b971b7b571dac7215dcf2591a30994b3450e0629925ffcfe2c68cc5c | |
3 | +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip | |
4 | +networkTimeout=10000 | |
5 | +validateDistributionUrl=true | |
5 | 6 | zipStoreBase=GRADLE_USER_HOME |
6 | 7 | zipStorePath=wrapper/dists |
@@ -1,7 +1,7 @@ | ||
1 | -#!/usr/bin/env sh | |
1 | +#!/bin/sh | |
2 | 2 | |
3 | 3 | # |
4 | -# Copyright 2015 the original author or authors. | |
4 | +# Copyright © 2015-2021 the original authors. | |
5 | 5 | # |
6 | 6 | # Licensed under the Apache License, Version 2.0 (the "License"); |
7 | 7 | # you may not use this file except in compliance with the License. |
@@ -17,78 +17,111 @@ | ||
17 | 17 | # |
18 | 18 | |
19 | 19 | ############################################################################## |
20 | -## | |
21 | -## Gradle start up script for UN*X | |
22 | -## | |
20 | +# | |
21 | +# Gradle start up script for POSIX generated by Gradle. | |
22 | +# | |
23 | +# Important for running: | |
24 | +# | |
25 | +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is | |
26 | +# noncompliant, but you have some other compliant shell such as ksh or | |
27 | +# bash, then to run this script, type that shell name before the whole | |
28 | +# command line, like: | |
29 | +# | |
30 | +# ksh Gradle | |
31 | +# | |
32 | +# Busybox and similar reduced shells will NOT work, because this script | |
33 | +# requires all of these POSIX shell features: | |
34 | +# * functions; | |
35 | +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», | |
36 | +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; | |
37 | +# * compound commands having a testable exit status, especially «case»; | |
38 | +# * various built-in commands including «command», «set», and «ulimit». | |
39 | +# | |
40 | +# Important for patching: | |
41 | +# | |
42 | +# (2) This script targets any POSIX shell, so it avoids extensions provided | |
43 | +# by Bash, Ksh, etc; in particular arrays are avoided. | |
44 | +# | |
45 | +# The "traditional" practice of packing multiple parameters into a | |
46 | +# space-separated string is a well documented source of bugs and security | |
47 | +# problems, so this is (mostly) avoided, by progressively accumulating | |
48 | +# options in "$@", and eventually passing that to Java. | |
49 | +# | |
50 | +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, | |
51 | +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; | |
52 | +# see the in-line comments for details. | |
53 | +# | |
54 | +# There are tweaks for specific operating systems such as AIX, CygWin, | |
55 | +# Darwin, MinGW, and NonStop. | |
56 | +# | |
57 | +# (3) This script is generated from the Groovy template | |
58 | +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt | |
59 | +# within the Gradle project. | |
60 | +# | |
61 | +# You can find Gradle at https://github.com/gradle/gradle/. | |
62 | +# | |
23 | 63 | ############################################################################## |
24 | 64 | |
25 | 65 | # Attempt to set APP_HOME |
66 | + | |
26 | 67 | # Resolve links: $0 may be a link |
27 | -PRG="$0" | |
28 | -# Need this for relative symlinks. | |
29 | -while [ -h "$PRG" ] ; do | |
30 | - ls=`ls -ld "$PRG"` | |
31 | - link=`expr "$ls" : '.*-> \(.*\)$'` | |
32 | - if expr "$link" : '/.*' > /dev/null; then | |
33 | - PRG="$link" | |
34 | - else | |
35 | - PRG=`dirname "$PRG"`"/$link" | |
36 | - fi | |
68 | +app_path=$0 | |
69 | + | |
70 | +# Need this for daisy-chained symlinks. | |
71 | +while | |
72 | + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path | |
73 | + [ -h "$app_path" ] | |
74 | +do | |
75 | + ls=$( ls -ld "$app_path" ) | |
76 | + link=${ls#*' -> '} | |
77 | + case $link in #( | |
78 | + /*) app_path=$link ;; #( | |
79 | + *) app_path=$APP_HOME$link ;; | |
80 | + esac | |
37 | 81 | done |
38 | -SAVED="`pwd`" | |
39 | -cd "`dirname \"$PRG\"`/" >/dev/null | |
40 | -APP_HOME="`pwd -P`" | |
41 | -cd "$SAVED" >/dev/null | |
42 | 82 | |
43 | -APP_NAME="Gradle" | |
44 | -APP_BASE_NAME=`basename "$0"` | |
45 | - | |
46 | -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | |
47 | -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | |
83 | +# This is normally unused | |
84 | +# shellcheck disable=SC2034 | |
85 | +APP_BASE_NAME=${0##*/} | |
86 | +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) | |
87 | +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit | |
48 | 88 | |
49 | 89 | # Use the maximum available, or set MAX_FD != -1 to use that value. |
50 | -MAX_FD="maximum" | |
90 | +MAX_FD=maximum | |
51 | 91 | |
52 | 92 | warn () { |
53 | 93 | echo "$*" |
54 | -} | |
94 | +} >&2 | |
55 | 95 | |
56 | 96 | die () { |
57 | 97 | echo |
58 | 98 | echo "$*" |
59 | 99 | echo |
60 | 100 | exit 1 |
61 | -} | |
101 | +} >&2 | |
62 | 102 | |
63 | 103 | # OS specific support (must be 'true' or 'false'). |
64 | 104 | cygwin=false |
65 | 105 | msys=false |
66 | 106 | darwin=false |
67 | 107 | nonstop=false |
68 | -case "`uname`" in | |
69 | - CYGWIN* ) | |
70 | - cygwin=true | |
71 | - ;; | |
72 | - Darwin* ) | |
73 | - darwin=true | |
74 | - ;; | |
75 | - MINGW* ) | |
76 | - msys=true | |
77 | - ;; | |
78 | - NONSTOP* ) | |
79 | - nonstop=true | |
80 | - ;; | |
108 | +case "$( uname )" in #( | |
109 | + CYGWIN* ) cygwin=true ;; #( | |
110 | + Darwin* ) darwin=true ;; #( | |
111 | + MSYS* | MINGW* ) msys=true ;; #( | |
112 | + NONSTOP* ) nonstop=true ;; | |
81 | 113 | esac |
82 | 114 | |
83 | 115 | CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar |
84 | 116 | |
117 | + | |
85 | 118 | # Determine the Java command to use to start the JVM. |
86 | 119 | if [ -n "$JAVA_HOME" ] ; then |
87 | 120 | if [ -x "$JAVA_HOME/jre/sh/java" ] ; then |
88 | 121 | # IBM's JDK on AIX uses strange locations for the executables |
89 | - JAVACMD="$JAVA_HOME/jre/sh/java" | |
122 | + JAVACMD=$JAVA_HOME/jre/sh/java | |
90 | 123 | else |
91 | - JAVACMD="$JAVA_HOME/bin/java" | |
124 | + JAVACMD=$JAVA_HOME/bin/java | |
92 | 125 | fi |
93 | 126 | if [ ! -x "$JAVACMD" ] ; then |
94 | 127 | die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME |
@@ -97,87 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the | ||
97 | 130 | location of your Java installation." |
98 | 131 | fi |
99 | 132 | else |
100 | - JAVACMD="java" | |
101 | - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | |
133 | + JAVACMD=java | |
134 | + if ! command -v java >/dev/null 2>&1 | |
135 | + then | |
136 | + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | |
102 | 137 | |
103 | 138 | Please set the JAVA_HOME variable in your environment to match the |
104 | 139 | location of your Java installation." |
140 | + fi | |
105 | 141 | fi |
106 | 142 | |
107 | 143 | # Increase the maximum file descriptors if we can. |
108 | -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then | |
109 | - MAX_FD_LIMIT=`ulimit -H -n` | |
110 | - if [ $? -eq 0 ] ; then | |
111 | - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then | |
112 | - MAX_FD="$MAX_FD_LIMIT" | |
113 | - fi | |
114 | - ulimit -n $MAX_FD | |
115 | - if [ $? -ne 0 ] ; then | |
116 | - warn "Could not set maximum file descriptor limit: $MAX_FD" | |
117 | - fi | |
118 | - else | |
119 | - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" | |
120 | - fi | |
144 | +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then | |
145 | + case $MAX_FD in #( | |
146 | + max*) | |
147 | + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. | |
148 | + # shellcheck disable=SC3045 | |
149 | + MAX_FD=$( ulimit -H -n ) || | |
150 | + warn "Could not query maximum file descriptor limit" | |
151 | + esac | |
152 | + case $MAX_FD in #( | |
153 | + '' | soft) :;; #( | |
154 | + *) | |
155 | + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. | |
156 | + # shellcheck disable=SC3045 | |
157 | + ulimit -n "$MAX_FD" || | |
158 | + warn "Could not set maximum file descriptor limit to $MAX_FD" | |
159 | + esac | |
121 | 160 | fi |
122 | 161 | |
123 | -# For Darwin, add options to specify how the application appears in the dock | |
124 | -if $darwin; then | |
125 | - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" | |
126 | -fi | |
162 | +# Collect all arguments for the java command, stacking in reverse order: | |
163 | +# * args from the command line | |
164 | +# * the main class name | |
165 | +# * -classpath | |
166 | +# * -D...appname settings | |
167 | +# * --module-path (only if needed) | |
168 | +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. | |
127 | 169 | |
128 | 170 | # For Cygwin or MSYS, switch paths to Windows format before running java |
129 | -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then | |
130 | - APP_HOME=`cygpath --path --mixed "$APP_HOME"` | |
131 | - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` | |
132 | - JAVACMD=`cygpath --unix "$JAVACMD"` | |
133 | - | |
134 | - # We build the pattern for arguments to be converted via cygpath | |
135 | - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` | |
136 | - SEP="" | |
137 | - for dir in $ROOTDIRSRAW ; do | |
138 | - ROOTDIRS="$ROOTDIRS$SEP$dir" | |
139 | - SEP="|" | |
140 | - done | |
141 | - OURCYGPATTERN="(^($ROOTDIRS))" | |
142 | - # Add a user-defined pattern to the cygpath arguments | |
143 | - if [ "$GRADLE_CYGPATTERN" != "" ] ; then | |
144 | - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" | |
145 | - fi | |
171 | +if "$cygwin" || "$msys" ; then | |
172 | + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) | |
173 | + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) | |
174 | + | |
175 | + JAVACMD=$( cygpath --unix "$JAVACMD" ) | |
176 | + | |
146 | 177 | # Now convert the arguments - kludge to limit ourselves to /bin/sh |
147 | - i=0 | |
148 | - for arg in "$@" ; do | |
149 | - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` | |
150 | - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option | |
151 | - | |
152 | - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition | |
153 | - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` | |
154 | - else | |
155 | - eval `echo args$i`="\"$arg\"" | |
178 | + for arg do | |
179 | + if | |
180 | + case $arg in #( | |
181 | + -*) false ;; # don't mess with options #( | |
182 | + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath | |
183 | + [ -e "$t" ] ;; #( | |
184 | + *) false ;; | |
185 | + esac | |
186 | + then | |
187 | + arg=$( cygpath --path --ignore --mixed "$arg" ) | |
156 | 188 | fi |
157 | - i=`expr $i + 1` | |
189 | + # Roll the args list around exactly as many times as the number of | |
190 | + # args, so each arg winds up back in the position where it started, but | |
191 | + # possibly modified. | |
192 | + # | |
193 | + # NB: a `for` loop captures its iteration list before it begins, so | |
194 | + # changing the positional parameters here affects neither the number of | |
195 | + # iterations, nor the values presented in `arg`. | |
196 | + shift # remove old arg | |
197 | + set -- "$@" "$arg" # push replacement arg | |
158 | 198 | done |
159 | - case $i in | |
160 | - 0) set -- ;; | |
161 | - 1) set -- "$args0" ;; | |
162 | - 2) set -- "$args0" "$args1" ;; | |
163 | - 3) set -- "$args0" "$args1" "$args2" ;; | |
164 | - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; | |
165 | - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; | |
166 | - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; | |
167 | - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; | |
168 | - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; | |
169 | - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; | |
170 | - esac | |
171 | 199 | fi |
172 | 200 | |
173 | -# Escape application args | |
174 | -save () { | |
175 | - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done | |
176 | - echo " " | |
177 | -} | |
178 | -APP_ARGS=`save "$@"` | |
179 | 201 | |
180 | -# Collect all arguments for the java command, following the shell quoting and substitution rules | |
181 | -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" | |
202 | +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | |
203 | +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' | |
204 | + | |
205 | +# Collect all arguments for the java command; | |
206 | +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of | |
207 | +# shell script including quotes and variable substitutions, so put them in | |
208 | +# double quotes to make sure that they get re-expanded; and | |
209 | +# * put everything else in single quotes, so that it's not re-expanded. | |
210 | + | |
211 | +set -- \ | |
212 | + "-Dorg.gradle.appname=$APP_BASE_NAME" \ | |
213 | + -classpath "$CLASSPATH" \ | |
214 | + org.gradle.wrapper.GradleWrapperMain \ | |
215 | + "$@" | |
216 | + | |
217 | +# Stop when "xargs" is not available. | |
218 | +if ! command -v xargs >/dev/null 2>&1 | |
219 | +then | |
220 | + die "xargs is not available" | |
221 | +fi | |
222 | + | |
223 | +# Use "xargs" to parse quoted args. | |
224 | +# | |
225 | +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. | |
226 | +# | |
227 | +# In Bash we could simply go: | |
228 | +# | |
229 | +# readarray ARGS < <( xargs -n1 <<<"$var" ) && | |
230 | +# set -- "${ARGS[@]}" "$@" | |
231 | +# | |
232 | +# but POSIX shell has neither arrays nor command substitution, so instead we | |
233 | +# post-process each arg (as a line of input to sed) to backslash-escape any | |
234 | +# character that might be a shell metacharacter, then use eval to reverse | |
235 | +# that process (while maintaining the separation between arguments), and wrap | |
236 | +# the whole thing up as a single "set" statement. | |
237 | +# | |
238 | +# This will of course break if any of these variables contains a newline or | |
239 | +# an unmatched quote. | |
240 | +# | |
241 | + | |
242 | +eval "set -- $( | |
243 | + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | | |
244 | + xargs -n1 | | |
245 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | | |
246 | + tr '\n' ' ' | |
247 | + )" '"$@"' | |
182 | 248 | |
183 | 249 | exec "$JAVACMD" "$@" |
@@ -14,7 +14,7 @@ | ||
14 | 14 | @rem limitations under the License. |
15 | 15 | @rem |
16 | 16 | |
17 | -@if "%DEBUG%" == "" @echo off | |
17 | +@if "%DEBUG%"=="" @echo off | |
18 | 18 | @rem ########################################################################## |
19 | 19 | @rem |
20 | 20 | @rem Gradle startup script for Windows |
@@ -25,10 +25,14 @@ | ||
25 | 25 | if "%OS%"=="Windows_NT" setlocal |
26 | 26 | |
27 | 27 | set DIRNAME=%~dp0 |
28 | -if "%DIRNAME%" == "" set DIRNAME=. | |
28 | +if "%DIRNAME%"=="" set DIRNAME=. | |
29 | +@rem This is normally unused | |
29 | 30 | set APP_BASE_NAME=%~n0 |
30 | 31 | set APP_HOME=%DIRNAME% |
31 | 32 | |
33 | +@rem Resolve any "." and ".." in APP_HOME to make it shorter. | |
34 | +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi | |
35 | + | |
32 | 36 | @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. |
33 | 37 | set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" |
34 | 38 |
@@ -37,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome | ||
37 | 41 | |
38 | 42 | set JAVA_EXE=java.exe |
39 | 43 | %JAVA_EXE% -version >NUL 2>&1 |
40 | -if "%ERRORLEVEL%" == "0" goto init | |
44 | +if %ERRORLEVEL% equ 0 goto execute | |
41 | 45 | |
42 | 46 | echo. |
43 | 47 | echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. |
@@ -51,7 +55,7 @@ goto fail | ||
51 | 55 | set JAVA_HOME=%JAVA_HOME:"=% |
52 | 56 | set JAVA_EXE=%JAVA_HOME%/bin/java.exe |
53 | 57 | |
54 | -if exist "%JAVA_EXE%" goto init | |
58 | +if exist "%JAVA_EXE%" goto execute | |
55 | 59 | |
56 | 60 | echo. |
57 | 61 | echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% |
@@ -61,38 +65,26 @@ echo location of your Java installation. | ||
61 | 65 | |
62 | 66 | goto fail |
63 | 67 | |
64 | -:init | |
65 | -@rem Get command-line arguments, handling Windows variants | |
66 | - | |
67 | -if not "%OS%" == "Windows_NT" goto win9xME_args | |
68 | - | |
69 | -:win9xME_args | |
70 | -@rem Slurp the command line arguments. | |
71 | -set CMD_LINE_ARGS= | |
72 | -set _SKIP=2 | |
73 | - | |
74 | -:win9xME_args_slurp | |
75 | -if "x%~1" == "x" goto execute | |
76 | - | |
77 | -set CMD_LINE_ARGS=%* | |
78 | - | |
79 | 68 | :execute |
80 | 69 | @rem Setup the command line |
81 | 70 | |
82 | 71 | set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar |
83 | 72 | |
73 | + | |
84 | 74 | @rem Execute Gradle |
85 | -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% | |
75 | +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* | |
86 | 76 | |
87 | 77 | :end |
88 | 78 | @rem End local scope for the variables with windows NT shell |
89 | -if "%ERRORLEVEL%"=="0" goto mainEnd | |
79 | +if %ERRORLEVEL% equ 0 goto mainEnd | |
90 | 80 | |
91 | 81 | :fail |
92 | 82 | rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of |
93 | 83 | rem the _cmd.exe /c_ return code! |
94 | -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 | |
95 | -exit /b 1 | |
84 | +set EXIT_CODE=%ERRORLEVEL% | |
85 | +if %EXIT_CODE% equ 0 set EXIT_CODE=1 | |
86 | +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% | |
87 | +exit /b %EXIT_CODE% | |
96 | 88 | |
97 | 89 | :mainEnd |
98 | 90 | if "%OS%"=="Windows_NT" endlocal |