Skip to content

Commit 565112d

Browse files
committed
[COMMON] upgrade gradle from 8.14.1 to 9.2.1
1 parent bffd3c9 commit 565112d

File tree

8 files changed

+59
-27
lines changed

8 files changed

+59
-27
lines changed

app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ ext {
6161
numberOfForks = project.hasProperty('maxParallelForks') ? maxParallelForks.toInteger() : Math.max((int) (Runtime.runtime.availableProcessors() / 2), 1)
6262
}
6363

64-
archivesBaseName = "astraea-app"
64+
base {
65+
archivesName = 'astraea-app'
66+
}
6567

6668
tasks.named('test') {
6769
// Use JUnit Platform for unit tests.

common/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ ext {
5656
numberOfForks = project.hasProperty('maxParallelForks') ? maxParallelForks.toInteger() : Math.max((int) (Runtime.runtime.availableProcessors() / 2), 1)
5757
}
5858

59-
archivesBaseName = "astraea-common"
59+
base {
60+
archivesName = 'astraea-common'
61+
}
6062

6163
protobuf {
6264
// Configure the protoc executable

connector/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ ext {
7272
numberOfForks = project.hasProperty('maxParallelForks') ? maxParallelForks.toInteger() : Math.max((int) (Runtime.runtime.availableProcessors() / 2), 1)
7373
}
7474

75-
archivesBaseName = "astraea-connector"
75+
base {
76+
archivesName = 'astraea-connector'
77+
}
7678

7779
tasks.named('test') {
7880
// Use JUnit Platform for unit tests.

fs/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ ext {
6363
numberOfForks = project.hasProperty('maxParallelForks') ? maxParallelForks.toInteger() : Math.max((int) (Runtime.runtime.availableProcessors() / 2), 1)
6464
}
6565

66-
archivesBaseName = "astraea-fs"
66+
base {
67+
archivesName = 'astraea-fs'
68+
}
6769

6870
tasks.named('test') {
6971
// Use JUnit Platform for unit tests.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
# please update the gradle version in gradlew too
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip
3+
distributionSha256Sum=f86344275d1b194688dd330abf9f6f2344cd02872ffee035f2d1ea2fd60cf7f3
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
5+
networkTimeout=10000
6+
validateDistributionUrl=true
57
zipStoreBase=GRADLE_USER_HOME
68
zipStorePath=wrapper/dists

gradlew

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
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+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (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
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
8082
esac
8183
done
8284

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
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"'
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
9090

9191
# Use the maximum available, or set MAX_FD != -1 to use that value.
9292
MAX_FD=maximum
@@ -114,17 +114,17 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117+
CLASSPATH="\\\"\\\""
118+
117119
# gradle-wrapper.jar is not in git repo anymore, so we have to download it now.
118120
if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then
119-
if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v8.14.1/gradle/wrapper/gradle-wrapper.jar"; then
121+
if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v9.2.1/gradle/wrapper/gradle-wrapper.jar"; then
120122
rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
121123
echo "failed to download gradle-wrapper.jar"
122124
exit 1
123125
fi
124126
fi
125127

126-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
127-
128128

129129
# Determine the Java command to use to start the JVM.
130130
if [ -n "$JAVA_HOME" ] ; then
@@ -142,22 +142,29 @@ location of your Java installation."
142142
fi
143143
else
144144
JAVACMD=java
145-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
145+
if ! command -v java >/dev/null 2>&1
146+
then
147+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
146148
147149
Please set the JAVA_HOME variable in your environment to match the
148150
location of your Java installation."
151+
fi
149152
fi
150153

151154
# Increase the maximum file descriptors if we can.
152155
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
153156
case $MAX_FD in #(
154157
max*)
158+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
159+
# shellcheck disable=SC2039,SC3045
155160
MAX_FD=$( ulimit -H -n ) ||
156161
warn "Could not query maximum file descriptor limit"
157162
esac
158163
case $MAX_FD in #(
159164
'' | soft) :;; #(
160165
*)
166+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
167+
# shellcheck disable=SC2039,SC3045
161168
ulimit -n "$MAX_FD" ||
162169
warn "Could not set maximum file descriptor limit to $MAX_FD"
163170
esac
@@ -202,18 +209,28 @@ if "$cygwin" || "$msys" ; then
202209
done
203210
fi
204211

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

211222
set -- \
212223
"-Dorg.gradle.appname=$APP_BASE_NAME" \
213224
-classpath "$CLASSPATH" \
214-
org.gradle.wrapper.GradleWrapperMain \
225+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
215226
"$@"
216227

228+
# Stop when "xargs" is not available.
229+
if ! command -v xargs >/dev/null 2>&1
230+
then
231+
die "xargs is not available"
232+
fi
233+
217234
# Use "xargs" to parse quoted args.
218235
#
219236
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gui/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* limitations under the License.
1616
*/
1717
plugins {
18-
id 'org.openjfx.javafxplugin' version '0.0.13'
19-
id "com.github.johnrengelman.shadow" version "8.1.1"
18+
id 'org.openjfx.javafxplugin' version '0.0.14'
19+
id "com.gradleup.shadow" version "9.2.2"
2020
id 'maven-publish'
2121
}
2222

@@ -40,7 +40,10 @@ ext {
4040
numberOfForks = project.hasProperty('maxParallelForks') ? maxParallelForks.toInteger() : Math.max((int) (Runtime.runtime.availableProcessors() / 2), 1)
4141
}
4242

43-
archivesBaseName = "astraea-gui"
43+
base {
44+
archivesName = 'astraea-gui'
45+
}
46+
4447
jar {
4548
manifest {
4649
attributes 'Main-Class': 'org.astraea.gui.Main'

it/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ ext {
4747
numberOfForks = project.hasProperty('maxParallelForks') ? maxParallelForks.toInteger() : Math.max((int) (Runtime.runtime.availableProcessors() / 2), 1)
4848
}
4949

50-
archivesBaseName = "astraea-it"
50+
base {
51+
archivesName = 'astraea-it'
52+
}
5153

5254
tasks.named('test') {
5355
// Use JUnit Platform for unit tests.

0 commit comments

Comments
 (0)