Skip to content

Commit 53da758

Browse files
committedFeb 6, 2025
Revert "Gradle bump to 7.6.4"
This reverts commit bedcdae.
1 parent 84b4185 commit 53da758

File tree

3 files changed

+105
-154
lines changed

3 files changed

+105
-154
lines changed
 

‎gradle/wrapper/gradle-wrapper.jar

-333 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew

+104-153
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/sh
1+
#!/usr/bin/env sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright 2015 the original author or authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
1717
#
1818

1919
##############################################################################
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/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-
#
20+
##
21+
## Gradle start up script for UN*X
22+
##
6323
##############################################################################
6424

6525
# Attempt to set APP_HOME
66-
6726
# Resolve links: $0 may be a link
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
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
8137
done
82-
83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
8442

8543
APP_NAME="Gradle"
86-
APP_BASE_NAME=${0##*/}
44+
APP_BASE_NAME=`basename "$0"`
8745

8846
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
8947
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
9048

9149
# Use the maximum available, or set MAX_FD != -1 to use that value.
92-
MAX_FD=maximum
50+
MAX_FD="maximum"
9351

9452
warn () {
9553
echo "$*"
96-
} >&2
54+
}
9755

9856
die () {
9957
echo
10058
echo "$*"
10159
echo
10260
exit 1
103-
} >&2
61+
}
10462

10563
# OS specific support (must be 'true' or 'false').
10664
cygwin=false
10765
msys=false
10866
darwin=false
10967
nonstop=false
110-
case "$( uname )" in #(
111-
CYGWIN* ) cygwin=true ;; #(
112-
Darwin* ) darwin=true ;; #(
113-
MSYS* | MINGW* ) msys=true ;; #(
114-
NONSTOP* ) nonstop=true ;;
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+
;;
11581
esac
11682

11783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
12187
if [ -n "$JAVA_HOME" ] ; then
12288
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
12389
# IBM's JDK on AIX uses strange locations for the executables
124-
JAVACMD=$JAVA_HOME/jre/sh/java
90+
JAVACMD="$JAVA_HOME/jre/sh/java"
12591
else
126-
JAVACMD=$JAVA_HOME/bin/java
92+
JAVACMD="$JAVA_HOME/bin/java"
12793
fi
12894
if [ ! -x "$JAVACMD" ] ; then
12995
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,103 +98,88 @@ Please set the JAVA_HOME variable in your environment to match the
13298
location of your Java installation."
13399
fi
134100
else
135-
JAVACMD=java
101+
JAVACMD="java"
136102
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137103
138104
Please set the JAVA_HOME variable in your environment to match the
139105
location of your Java installation."
140106
fi
141107

142108
# Increase the maximum file descriptors if we can.
143-
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144-
case $MAX_FD in #(
145-
max*)
146-
MAX_FD=$( ulimit -H -n ) ||
147-
warn "Could not query maximum file descriptor limit"
148-
esac
149-
case $MAX_FD in #(
150-
'' | soft) :;; #(
151-
*)
152-
ulimit -n "$MAX_FD" ||
153-
warn "Could not set maximum file descriptor limit to $MAX_FD"
154-
esac
109+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
110+
MAX_FD_LIMIT=`ulimit -H -n`
111+
if [ $? -eq 0 ] ; then
112+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
113+
MAX_FD="$MAX_FD_LIMIT"
114+
fi
115+
ulimit -n $MAX_FD
116+
if [ $? -ne 0 ] ; then
117+
warn "Could not set maximum file descriptor limit: $MAX_FD"
118+
fi
119+
else
120+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
121+
fi
155122
fi
156123

157-
# Collect all arguments for the java command, stacking in reverse order:
158-
# * args from the command line
159-
# * the main class name
160-
# * -classpath
161-
# * -D...appname settings
162-
# * --module-path (only if needed)
163-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
124+
# For Darwin, add options to specify how the application appears in the dock
125+
if $darwin; then
126+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
127+
fi
164128

165129
# For Cygwin or MSYS, switch paths to Windows format before running java
166-
if "$cygwin" || "$msys" ; then
167-
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
168-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
169-
170-
JAVACMD=$( cygpath --unix "$JAVACMD" )
171-
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132+
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
172148
# Now convert the arguments - kludge to limit ourselves to /bin/sh
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" )
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+
154+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
155+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
156+
else
157+
eval `echo args$i`="\"$arg\""
183158
fi
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
159+
i=`expr $i + 1`
193160
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
194173
fi
195174

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
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-
#
175+
# Escape application args
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
179+
}
180+
APP_ARGS=`save "$@"`
226181

227-
eval "set -- $(
228-
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
229-
xargs -n1 |
230-
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
231-
tr '\n' ' '
232-
)" '"$@"'
182+
# Collect all arguments for the java command, following the shell quoting and substitution rules
183+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
233184

234185
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)
Failed to load comments.