Skip to content

Commit 59379e6

Browse files
authored
upgrade gradle wrapper to 8.5 (#971)
* upgrade gradle wrapper to 8.5 * fix deprecations
1 parent a2adf32 commit 59379e6

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

application/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
plugins {
88
id 'application'
99
id 'com.google.cloud.tools.jib' version '3.4.0'
10-
id 'com.github.johnrengelman.shadow' version '8.1.0'
10+
id 'com.github.johnrengelman.shadow' version '8.1.1'
1111
id 'database-settings'
1212
}
1313

@@ -79,6 +79,7 @@ dependencies {
7979
testImplementation 'org.mockito:mockito-core:5.3.1'
8080
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
8181
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
82+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
8283
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
8384

8485
implementation "com.theokanning.openai-gpt3-java:api:$chatGPTVersion"

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
id 'java'
3-
id "com.diffplug.spotless" version "6.23.0"
4-
id "org.sonarqube" version "4.4.0.3356"
5-
id "name.remal.sonarlint" version "3.3.0"
3+
id "com.diffplug.spotless" version "6.23.2"
4+
id "org.sonarqube" version "4.4.1.3373"
5+
id "name.remal.sonarlint" version "3.3.17"
66
}
77

88
group 'org.togetherjava'
@@ -83,7 +83,7 @@ subprojects {
8383
// '\\#` is prefix for static imports
8484
importOrder('','org.togetherjava', 'javax', 'java', '\\#')
8585
// TODO Use latest eclipse jdt formatter, issue tracking this: https://github.com/Together-Java/TJ-Bot/issues/605
86-
eclipse('4.19.0').configFile("${rootProject.rootDir}/meta/formatting/google-style-eclipse.xml")
86+
eclipse('4.19').configFile("${rootProject.rootDir}/meta/formatting/google-style-eclipse.xml")
8787
}
8888
}
8989

gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145145
case $MAX_FD in #(
146146
max*)
147147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
149149
MAX_FD=$( ulimit -H -n ) ||
150150
warn "Could not query maximum file descriptor limit"
151151
esac
152152
case $MAX_FD in #(
153153
'' | soft) :;; #(
154154
*)
155155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
157157
ulimit -n "$MAX_FD" ||
158158
warn "Could not set maximum file descriptor limit to $MAX_FD"
159159
esac
@@ -202,11 +202,11 @@ fi
202202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

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.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)