Skip to content

Commit 5576b23

Browse files
committed
Harmonized Gradle version to 8.3, matching the version in BE and RTL (needed for composite build).
Signed-off-by: Philip R. Kensche <[email protected]> GitPrivacy: pK1cbmXSq7Gswqgvhm6aZxUc8TFHVbH8Q+hi0Mll9vTZWyBArQsGARMF+EYCqIS9EQNrefZ7dt4= HZ7su2s9F3m4M8iRJRnSzsdJ9RtFHHRLqrhkvjtDj9G+u0sh0da5wt7fFIAF6bf0v+MfB0ycxgc=
1 parent cbb8a74 commit 5576b23

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ application {
5050

5151
// Java settings
5252
java {
53-
toolchain {
54-
languageVersion = JavaLanguageVersion.of(8)
55-
}
53+
sourceCompatibility = JavaVersion.VERSION_1_8
54+
targetCompatibility = JavaVersion.VERSION_1_8
55+
// toolchain {
56+
// languageVersion = JavaLanguageVersion.of(8)
57+
// }
5658
}
5759

5860
compileJava.options.fork = true

gradle/wrapper/gradle-wrapper.jar

-2.05 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
networkTimeout=10000
5-
validateDistributionUrl=true
65
zipStoreBase=GRADLE_USER_HOME
76
zipStorePath=wrapper/dists

gradlew

+7-12
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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"'
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum
@@ -131,29 +133,26 @@ location of your Java installation."
131133
fi
132134
else
133135
JAVACMD=java
134-
if ! command -v java >/dev/null 2>&1
135-
then
136-
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.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140-
fi
141140
fi
142141

143142
# Increase the maximum file descriptors if we can.
144143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145144
case $MAX_FD in #(
146145
max*)
147146
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
147+
# shellcheck disable=SC3045
149148
MAX_FD=$( ulimit -H -n ) ||
150149
warn "Could not query maximum file descriptor limit"
151150
esac
152151
case $MAX_FD in #(
153152
'' | soft) :;; #(
154153
*)
155154
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
155+
# shellcheck disable=SC3045
157156
ulimit -n "$MAX_FD" ||
158157
warn "Could not set maximum file descriptor limit to $MAX_FD"
159158
esac
@@ -198,10 +197,6 @@ if "$cygwin" || "$msys" ; then
198197
done
199198
fi
200199

201-
202-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204-
205200
# Collect all arguments for the java command;
206201
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207202
# shell script including quotes and variable substitutions, so put them in

0 commit comments

Comments
 (0)