Skip to content

Commit 8adea96

Browse files
committed
Upgrade to Gradle 8.14.2
Signed-off-by: Roy Clarkson <[email protected]>
1 parent 0456c5c commit 8adea96

File tree

5 files changed

+25
-35
lines changed

5 files changed

+25
-35
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,6 @@ configure(rootProject) {
260260
}
261261

262262
wrapper {
263-
gradleVersion = "8.14"
263+
gradleVersion = "8.14.2"
264264
distributionType = Wrapper.DistributionType.ALL
265265
}

gradle/wrapper/gradle-wrapper.jar

17.5 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
44
networkTimeout=10000
5-
validateDistributionUrl=true
65
zipStoreBase=GRADLE_USER_HOME
76
zipStorePath=wrapper/dists

gradlew

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18-
# SPDX-License-Identifier: Apache-2.0
19-
#
2018

2119
##############################################################################
2220
#
@@ -57,7 +55,7 @@
5755
# Darwin, MinGW, and NonStop.
5856
#
5957
# (3) This script is generated from the Groovy template
60-
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
6159
# within the Gradle project.
6260
#
6361
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -85,8 +83,10 @@ done
8583
# This is normally unused
8684
# shellcheck disable=SC2034
8785
APP_BASE_NAME=${0##*/}
88-
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
86+
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87+
88+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
9090

9191
# Use the maximum available, or set MAX_FD != -1 to use that value.
9292
MAX_FD=maximum
@@ -133,29 +133,26 @@ location of your Java installation."
133133
fi
134134
else
135135
JAVACMD=java
136-
if ! command -v java >/dev/null 2>&1
137-
then
138-
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.
139137
140138
Please set the JAVA_HOME variable in your environment to match the
141139
location of your Java installation."
142-
fi
143140
fi
144141

145142
# Increase the maximum file descriptors if we can.
146143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
147144
case $MAX_FD in #(
148145
max*)
149146
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
150-
# shellcheck disable=SC2039,SC3045
147+
# shellcheck disable=SC3045
151148
MAX_FD=$( ulimit -H -n ) ||
152149
warn "Could not query maximum file descriptor limit"
153150
esac
154151
case $MAX_FD in #(
155152
'' | soft) :;; #(
156153
*)
157154
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
158-
# shellcheck disable=SC2039,SC3045
155+
# shellcheck disable=SC3045
159156
ulimit -n "$MAX_FD" ||
160157
warn "Could not set maximum file descriptor limit to $MAX_FD"
161158
esac
@@ -200,15 +197,11 @@ if "$cygwin" || "$msys" ; then
200197
done
201198
fi
202199

203-
204-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
205-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206-
207-
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209-
# and any embedded shellness will be escaped.
210-
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211-
# treated as '${Hostname}' itself on the command line.
200+
# Collect all arguments for the java command;
201+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202+
# shell script including quotes and variable substitutions, so put them in
203+
# double quotes to make sure that they get re-expanded; and
204+
# * put everything else in single quotes, so that it's not re-expanded.
212205

213206
set -- \
214207
"-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16-
@rem SPDX-License-Identifier: Apache-2.0
17-
@rem
1816

1917
@if "%DEBUG%"=="" @echo off
2018
@rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
4543
%JAVA_EXE% -version >NUL 2>&1
4644
if %ERRORLEVEL% equ 0 goto execute
4745

48-
echo. 1>&2
49-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50-
echo. 1>&2
51-
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52-
echo location of your Java installation. 1>&2
46+
echo.
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48+
echo.
49+
echo Please set the JAVA_HOME variable in your environment to match the
50+
echo location of your Java installation.
5351

5452
goto fail
5553

@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5957

6058
if exist "%JAVA_EXE%" goto execute
6159

62-
echo. 1>&2
63-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64-
echo. 1>&2
65-
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66-
echo location of your Java installation. 1>&2
60+
echo.
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62+
echo.
63+
echo Please set the JAVA_HOME variable in your environment to match the
64+
echo location of your Java installation.
6765

6866
goto fail
6967

0 commit comments

Comments
 (0)