Panagiotis Triantafyllou

updated gradle

1 -#Wed Oct 30 10:10:22 EET 2019
2 distributionBase=GRADLE_USER_HOME 1 distributionBase=GRADLE_USER_HOME
3 distributionPath=wrapper/dists 2 distributionPath=wrapper/dists
3 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
4 zipStoreBase=GRADLE_USER_HOME 4 zipStoreBase=GRADLE_USER_HOME
5 zipStorePath=wrapper/dists 5 zipStorePath=wrapper/dists
6 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
......
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 # Licensed under the Apache License, Version 2.0 (the "License"); 6 # Licensed under the Apache License, Version 2.0 (the "License");
7 # you may not use this file except in compliance with the License. 7 # you may not use this file except in compliance with the License.
...@@ -17,67 +17,101 @@ ...@@ -17,67 +17,101 @@
17 # 17 #
18 18
19 ############################################################################## 19 ##############################################################################
20 -## 20 +#
21 -## Gradle start up script for UN*X 21 +# Gradle start up script for POSIX generated by Gradle.
22 -## 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/master/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 # Attempt to set APP_HOME 65 # Attempt to set APP_HOME
66 +
26 # Resolve links: $0 may be a link 67 # Resolve links: $0 may be a link
27 -PRG="$0" 68 +app_path=$0
28 -# Need this for relative symlinks. 69 +
29 -while [ -h "$PRG" ] ; do 70 +# Need this for daisy-chained symlinks.
30 - ls=`ls -ld "$PRG"` 71 +while
31 - link=`expr "$ls" : '.*-> \(.*\)$'` 72 + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
32 - if expr "$link" : '/.*' > /dev/null; then 73 + [ -h "$app_path" ]
33 - PRG="$link" 74 +do
34 - else 75 + ls=$( ls -ld "$app_path" )
35 - PRG=`dirname "$PRG"`"/$link" 76 + link=${ls#*' -> '}
36 - fi 77 + case $link in #(
78 + /*) app_path=$link ;; #(
79 + *) app_path=$APP_HOME$link ;;
80 + esac
37 done 81 done
38 -SAVED="`pwd`" 82 +
39 -cd "`dirname \"$PRG\"`/" >/dev/null 83 +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
40 -APP_HOME="`pwd -P`"
41 -cd "$SAVED" >/dev/null
42 84
43 APP_NAME="Gradle" 85 APP_NAME="Gradle"
44 -APP_BASE_NAME=`basename "$0"` 86 +APP_BASE_NAME=${0##*/}
45 87
46 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. 88 # 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"' 89 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48 90
49 # Use the maximum available, or set MAX_FD != -1 to use that value. 91 # Use the maximum available, or set MAX_FD != -1 to use that value.
50 -MAX_FD="maximum" 92 +MAX_FD=maximum
51 93
52 warn () { 94 warn () {
53 echo "$*" 95 echo "$*"
54 -} 96 +} >&2
55 97
56 die () { 98 die () {
57 echo 99 echo
58 echo "$*" 100 echo "$*"
59 echo 101 echo
60 exit 1 102 exit 1
61 -} 103 +} >&2
62 104
63 # OS specific support (must be 'true' or 'false'). 105 # OS specific support (must be 'true' or 'false').
64 cygwin=false 106 cygwin=false
65 msys=false 107 msys=false
66 darwin=false 108 darwin=false
67 nonstop=false 109 nonstop=false
68 -case "`uname`" in 110 +case "$( uname )" in #(
69 - CYGWIN* ) 111 + CYGWIN* ) cygwin=true ;; #(
70 - cygwin=true 112 + Darwin* ) darwin=true ;; #(
71 - ;; 113 + MSYS* | MINGW* ) msys=true ;; #(
72 - Darwin* ) 114 + NONSTOP* ) nonstop=true ;;
73 - darwin=true
74 - ;;
75 - MINGW* )
76 - msys=true
77 - ;;
78 - NONSTOP* )
79 - nonstop=true
80 - ;;
81 esac 115 esac
82 116
83 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 117 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
...@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar ...@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
87 if [ -n "$JAVA_HOME" ] ; then 121 if [ -n "$JAVA_HOME" ] ; then
88 if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 122 if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
89 # IBM's JDK on AIX uses strange locations for the executables 123 # IBM's JDK on AIX uses strange locations for the executables
90 - JAVACMD="$JAVA_HOME/jre/sh/java" 124 + JAVACMD=$JAVA_HOME/jre/sh/java
91 else 125 else
92 - JAVACMD="$JAVA_HOME/bin/java" 126 + JAVACMD=$JAVA_HOME/bin/java
93 fi 127 fi
94 if [ ! -x "$JAVACMD" ] ; then 128 if [ ! -x "$JAVACMD" ] ; then
95 die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME 129 die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
...@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the ...@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
98 location of your Java installation." 132 location of your Java installation."
99 fi 133 fi
100 else 134 else
101 - JAVACMD="java" 135 + JAVACMD=java
102 which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 136 which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
103 137
104 Please set the JAVA_HOME variable in your environment to match the 138 Please set the JAVA_HOME variable in your environment to match the
...@@ -106,80 +140,95 @@ location of your Java installation." ...@@ -106,80 +140,95 @@ location of your Java installation."
106 fi 140 fi
107 141
108 # Increase the maximum file descriptors if we can. 142 # Increase the maximum file descriptors if we can.
109 -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then 143 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
110 - MAX_FD_LIMIT=`ulimit -H -n` 144 + case $MAX_FD in #(
111 - if [ $? -eq 0 ] ; then 145 + max*)
112 - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then 146 + MAX_FD=$( ulimit -H -n ) ||
113 - MAX_FD="$MAX_FD_LIMIT" 147 + warn "Could not query maximum file descriptor limit"
114 - fi 148 + esac
115 - ulimit -n $MAX_FD 149 + case $MAX_FD in #(
116 - if [ $? -ne 0 ] ; then 150 + '' | soft) :;; #(
117 - warn "Could not set maximum file descriptor limit: $MAX_FD" 151 + *)
118 - fi 152 + ulimit -n "$MAX_FD" ||
119 - else 153 + warn "Could not set maximum file descriptor limit to $MAX_FD"
120 - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" 154 + esac
121 - fi
122 fi 155 fi
123 156
124 -# For Darwin, add options to specify how the application appears in the dock 157 +# Collect all arguments for the java command, stacking in reverse order:
125 -if $darwin; then 158 +# * args from the command line
126 - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" 159 +# * the main class name
127 -fi 160 +# * -classpath
161 +# * -D...appname settings
162 +# * --module-path (only if needed)
163 +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
128 164
129 # For Cygwin or MSYS, switch paths to Windows format before running java 165 # For Cygwin or MSYS, switch paths to Windows format before running java
130 -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then 166 +if "$cygwin" || "$msys" ; then
131 - APP_HOME=`cygpath --path --mixed "$APP_HOME"` 167 + APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
132 - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` 168 + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
133 -
134 - JAVACMD=`cygpath --unix "$JAVACMD"`
135 -
136 - # We build the pattern for arguments to be converted via cygpath
137 - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
138 - SEP=""
139 - for dir in $ROOTDIRSRAW ; do
140 - ROOTDIRS="$ROOTDIRS$SEP$dir"
141 - SEP="|"
142 - done
143 - OURCYGPATTERN="(^($ROOTDIRS))"
144 - # Add a user-defined pattern to the cygpath arguments
145 - if [ "$GRADLE_CYGPATTERN" != "" ] ; then
146 - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
147 - fi
148 - # Now convert the arguments - kludge to limit ourselves to /bin/sh
149 - i=0
150 - for arg in "$@" ; do
151 - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
152 - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
153 169
154 - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition 170 + JAVACMD=$( cygpath --unix "$JAVACMD" )
155 - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` 171 +
156 - else 172 + # Now convert the arguments - kludge to limit ourselves to /bin/sh
157 - eval `echo args$i`="\"$arg\"" 173 + for arg do
174 + if
175 + case $arg in #(
176 + -*) false ;; # don't mess with options #(
177 + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
178 + [ -e "$t" ] ;; #(
179 + *) false ;;
180 + esac
181 + then
182 + arg=$( cygpath --path --ignore --mixed "$arg" )
158 fi 183 fi
159 - i=`expr $i + 1` 184 + # Roll the args list around exactly as many times as the number of
185 + # args, so each arg winds up back in the position where it started, but
186 + # possibly modified.
187 + #
188 + # NB: a `for` loop captures its iteration list before it begins, so
189 + # changing the positional parameters here affects neither the number of
190 + # iterations, nor the values presented in `arg`.
191 + shift # remove old arg
192 + set -- "$@" "$arg" # push replacement arg
160 done 193 done
161 - case $i in
162 - 0) set -- ;;
163 - 1) set -- "$args0" ;;
164 - 2) set -- "$args0" "$args1" ;;
165 - 3) set -- "$args0" "$args1" "$args2" ;;
166 - 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167 - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168 - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169 - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170 - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171 - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
172 - esac
173 fi 194 fi
174 195
175 -# Escape application args 196 +# Collect all arguments for the java command;
176 -save () { 197 +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
177 - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done 198 +# shell script including quotes and variable substitutions, so put them in
178 - echo " " 199 +# double quotes to make sure that they get re-expanded; and
179 -} 200 +# * put everything else in single quotes, so that it's not re-expanded.
180 -APP_ARGS=`save "$@"` 201 +
202 +set -- \
203 + "-Dorg.gradle.appname=$APP_BASE_NAME" \
204 + -classpath "$CLASSPATH" \
205 + org.gradle.wrapper.GradleWrapperMain \
206 + "$@"
207 +
208 +# Use "xargs" to parse quoted args.
209 +#
210 +# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
211 +#
212 +# In Bash we could simply go:
213 +#
214 +# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
215 +# set -- "${ARGS[@]}" "$@"
216 +#
217 +# but POSIX shell has neither arrays nor command substitution, so instead we
218 +# post-process each arg (as a line of input to sed) to backslash-escape any
219 +# character that might be a shell metacharacter, then use eval to reverse
220 +# that process (while maintaining the separation between arguments), and wrap
221 +# the whole thing up as a single "set" statement.
222 +#
223 +# This will of course break if any of these variables contains a newline or
224 +# an unmatched quote.
225 +#
181 226
182 -# Collect all arguments for the java command, following the shell quoting and substitution rules 227 +eval "set -- $(
183 -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" 228 + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
229 + xargs -n1 |
230 + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
231 + tr '\n' ' '
232 + )" '"$@"'
184 233
185 exec "$JAVACMD" "$@" 234 exec "$JAVACMD" "$@"
......
...@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome ...@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
40 40
41 set JAVA_EXE=java.exe 41 set JAVA_EXE=java.exe
42 %JAVA_EXE% -version >NUL 2>&1 42 %JAVA_EXE% -version >NUL 2>&1
43 -if "%ERRORLEVEL%" == "0" goto init 43 +if "%ERRORLEVEL%" == "0" goto execute
44 44
45 echo. 45 echo.
46 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 46 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
...@@ -54,7 +54,7 @@ goto fail ...@@ -54,7 +54,7 @@ goto fail
54 set JAVA_HOME=%JAVA_HOME:"=% 54 set JAVA_HOME=%JAVA_HOME:"=%
55 set JAVA_EXE=%JAVA_HOME%/bin/java.exe 55 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
56 56
57 -if exist "%JAVA_EXE%" goto init 57 +if exist "%JAVA_EXE%" goto execute
58 58
59 echo. 59 echo.
60 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 60 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
...@@ -64,21 +64,6 @@ echo location of your Java installation. ...@@ -64,21 +64,6 @@ echo location of your Java installation.
64 64
65 goto fail 65 goto fail
66 66
67 -:init
68 -@rem Get command-line arguments, handling Windows variants
69 -
70 -if not "%OS%" == "Windows_NT" goto win9xME_args
71 -
72 -:win9xME_args
73 -@rem Slurp the command line arguments.
74 -set CMD_LINE_ARGS=
75 -set _SKIP=2
76 -
77 -:win9xME_args_slurp
78 -if "x%~1" == "x" goto execute
79 -
80 -set CMD_LINE_ARGS=%*
81 -
82 :execute 67 :execute
83 @rem Setup the command line 68 @rem Setup the command line
84 69
...@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar ...@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
86 71
87 72
88 @rem Execute Gradle 73 @rem Execute Gradle
89 -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% 74 +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
90 75
91 :end 76 :end
92 @rem End local scope for the variables with windows NT shell 77 @rem End local scope for the variables with windows NT shell
......