Skip to content

Commit f2d9e44

Browse files
mar-v-inWSTxda
authored andcommitted
Update gradle
(cherry picked from commit 5fdc080)
1 parent 5ba97df commit f2d9e44

File tree

5 files changed

+36
-27
lines changed

5 files changed

+36
-27
lines changed

Diff for: .github/workflows/dependency-submission.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: "Generate and submit gradle dependency graph"
2525
uses: gradle/actions/dependency-submission@v4
2626
with:
27-
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
27+
cache-encryption-key: ${{ secrets.GradleEncryptionKey }}
2828
dependency-graph-continue-on-failure: true
2929
build-scan-publish: true
3030
build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"

Diff for: gradle/wrapper/gradle-wrapper.jar

-17.6 KB
Binary file not shown.

Diff for: gradle/wrapper/gradle-wrapper.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
distributionBase=GRADLE_USER_HOME
55
distributionPath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
77
networkTimeout=10000
8+
validateDistributionUrl=true
89
zipStoreBase=GRADLE_USER_HOME
910
zipStorePath=wrapper/dists

Diff for: gradlew

+21-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/sh
22

3-
# SPDX-License-Identifier: Apache-2.0
43
#
54
# Copyright © 2015-2021 the original authors.
65
#
@@ -16,6 +15,8 @@
1615
# See the License for the specific language governing permissions and
1716
# limitations under the License.
1817
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1920

2021
##############################################################################
2122
#
@@ -56,7 +57,7 @@
5657
# Darwin, MinGW, and NonStop.
5758
#
5859
# (3) This script is generated from the Groovy template
59-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
6061
# within the Gradle project.
6162
#
6263
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,10 +85,9 @@ done
8485
# This is normally unused
8586
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
88-
89-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
90-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
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
90+
' "$PWD" ) || exit
9191

9292
# Use the maximum available, or set MAX_FD != -1 to use that value.
9393
MAX_FD=maximum
@@ -134,26 +134,29 @@ location of your Java installation."
134134
fi
135135
else
136136
JAVACMD=java
137-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
138140
139141
Please set the JAVA_HOME variable in your environment to match the
140142
location of your Java installation."
143+
fi
141144
fi
142145

143146
# Increase the maximum file descriptors if we can.
144147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145148
case $MAX_FD in #(
146149
max*)
147150
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
151+
# shellcheck disable=SC2039,SC3045
149152
MAX_FD=$( ulimit -H -n ) ||
150153
warn "Could not query maximum file descriptor limit"
151154
esac
152155
case $MAX_FD in #(
153156
'' | soft) :;; #(
154157
*)
155158
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
159+
# shellcheck disable=SC2039,SC3045
157160
ulimit -n "$MAX_FD" ||
158161
warn "Could not set maximum file descriptor limit to $MAX_FD"
159162
esac
@@ -198,11 +201,15 @@ if "$cygwin" || "$msys" ; then
198201
done
199202
fi
200203

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

207214
set -- \
208215
"-Dorg.gradle.appname=$APP_BASE_NAME" \

Diff for: gradlew.bat

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@rem SPDX-License-Identifier: Apache-2.0
21
@rem
32
@rem Copyright 2015 the original author or authors.
43
@rem
@@ -14,6 +13,8 @@
1413
@rem See the License for the specific language governing permissions and
1514
@rem limitations under the License.
1615
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1718

1819
@if "%DEBUG%"=="" @echo off
1920
@rem ##########################################################################
@@ -44,11 +45,11 @@ set JAVA_EXE=java.exe
4445
%JAVA_EXE% -version >NUL 2>&1
4546
if %ERRORLEVEL% equ 0 goto execute
4647

47-
echo.
48-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
49-
echo.
50-
echo Please set the JAVA_HOME variable in your environment to match the
51-
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
5253

5354
goto fail
5455

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

5960
if exist "%JAVA_EXE%" goto execute
6061

61-
echo.
62-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
63-
echo.
64-
echo Please set the JAVA_HOME variable in your environment to match the
65-
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
6667

6768
goto fail
6869

0 commit comments

Comments
 (0)