Skip to content

Commit 3c7c89c

Browse files
committed
Update gradle to 8.14.2
1 parent 18cead6 commit 3c7c89c

File tree

4 files changed

+57
-35
lines changed

4 files changed

+57
-35
lines changed

gradle/wrapper/gradle-wrapper.jar

-16.6 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
distributionBase=GRADLE_USER_HOME
66
distributionPath=wrapper/dists
7-
distributionUrl=https\://packages.jetbrains.team/files/p/krpc/build-deps/distributions/gradle-8.13-bin.zip
7+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
8+
networkTimeout=10000
9+
validateDistributionUrl=true
810
zipStoreBase=GRADLE_USER_HOME
911
zipStorePath=wrapper/dists

gradlew

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
4+
# Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
55
#
66

77
##############################################################################
@@ -43,7 +43,7 @@
4343
# Darwin, MinGW, and NonStop.
4444
#
4545
# (3) This script is generated from the Groovy template
46-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
46+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
4747
# within the Gradle project.
4848
#
4949
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -68,13 +68,11 @@ do
6868
esac
6969
done
7070

71-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
72-
73-
APP_NAME="Gradle"
71+
# This is normally unused
72+
# shellcheck disable=SC2034
7473
APP_BASE_NAME=${0##*/}
75-
76-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
77-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
74+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
75+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
7876

7977
# Use the maximum available, or set MAX_FD != -1 to use that value.
8078
MAX_FD=maximum
@@ -102,7 +100,7 @@ case "$( uname )" in #(
102100
NONSTOP* ) nonstop=true ;;
103101
esac
104102

105-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
103+
CLASSPATH="\\\"\\\""
106104

107105

108106
# Determine the Java command to use to start the JVM.
@@ -121,22 +119,29 @@ location of your Java installation."
121119
fi
122120
else
123121
JAVACMD=java
124-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
122+
if ! command -v java >/dev/null 2>&1
123+
then
124+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
125125
126126
Please set the JAVA_HOME variable in your environment to match the
127127
location of your Java installation."
128+
fi
128129
fi
129130

130131
# Increase the maximum file descriptors if we can.
131132
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
132133
case $MAX_FD in #(
133134
max*)
135+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
136+
# shellcheck disable=SC2039,SC3045
134137
MAX_FD=$( ulimit -H -n ) ||
135138
warn "Could not query maximum file descriptor limit"
136139
esac
137140
case $MAX_FD in #(
138141
'' | soft) :;; #(
139142
*)
143+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
144+
# shellcheck disable=SC2039,SC3045
140145
ulimit -n "$MAX_FD" ||
141146
warn "Could not set maximum file descriptor limit to $MAX_FD"
142147
esac
@@ -181,18 +186,28 @@ if "$cygwin" || "$msys" ; then
181186
done
182187
fi
183188

184-
# Collect all arguments for the java command;
185-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
186-
# shell script including quotes and variable substitutions, so put them in
187-
# double quotes to make sure that they get re-expanded; and
188-
# * put everything else in single quotes, so that it's not re-expanded.
189+
190+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
191+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
192+
193+
# Collect all arguments for the java command:
194+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
195+
# and any embedded shellness will be escaped.
196+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
197+
# treated as '${Hostname}' itself on the command line.
189198

190199
set -- \
191200
"-Dorg.gradle.appname=$APP_BASE_NAME" \
192201
-classpath "$CLASSPATH" \
193-
org.gradle.wrapper.GradleWrapperMain \
202+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
194203
"$@"
195204

205+
# Stop when "xargs" is not available.
206+
if ! command -v xargs >/dev/null 2>&1
207+
then
208+
die "xargs is not available"
209+
fi
210+
196211
# Use "xargs" to parse quoted args.
197212
#
198213
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
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
1618

17-
@if "%DEBUG%" == "" @echo off
19+
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
1921
@rem
2022
@rem Gradle startup script for Windows
@@ -25,7 +27,8 @@
2527
if "%OS%"=="Windows_NT" setlocal
2628

2729
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
30+
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
2932
set APP_BASE_NAME=%~n0
3033
set APP_HOME=%DIRNAME%
3134

@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4043

4144
set JAVA_EXE=java.exe
4245
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
46+
if %ERRORLEVEL% equ 0 goto execute
4447

45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
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
5053

5154
goto fail
5255

@@ -56,32 +59,34 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5659

5760
if exist "%JAVA_EXE%" goto execute
5861

59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
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
6467

6568
goto fail
6669

6770
:execute
6871
@rem Setup the command line
6972

70-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7174

7275

7376
@rem Execute Gradle
74-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7578

7679
:end
7780
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
81+
if %ERRORLEVEL% equ 0 goto mainEnd
7982

8083
:fail
8184
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8285
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
86+
set EXIT_CODE=%ERRORLEVEL%
87+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
88+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89+
exit /b %EXIT_CODE%
8590

8691
:mainEnd
8792
if "%OS%"=="Windows_NT" endlocal

0 commit comments

Comments
 (0)