Skip to content

Commit 5294860

Browse files
authored
[choreolib] Upgrade Gradle and Maven dependencies (#1297)
1 parent 019559b commit 5294860

File tree

6 files changed

+25
-26
lines changed

6 files changed

+25
-26
lines changed

choreolib/build.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
id 'edu.wpi.first.NativeUtils' version '2025.9.0'
1010
id 'edu.wpi.first.GradleJni' version '1.1.0'
1111
id 'edu.wpi.first.GradleVsCode' version '2.1.0'
12-
id 'com.diffplug.spotless' version '6.25.0'
12+
id 'com.diffplug.spotless' version '7.2.1'
1313
id 'jacoco'
1414
}
1515

@@ -47,22 +47,22 @@ dependencies {
4747
implementation 'edu.wpi.first.ntcore:ntcore-jni:2025.+'
4848
implementation 'edu.wpi.first.hal:hal-java:2025.+'
4949

50-
api "com.fasterxml.jackson.core:jackson-annotations:2.15.2"
51-
api "com.fasterxml.jackson.core:jackson-core:2.15.2"
52-
api "com.fasterxml.jackson.core:jackson-databind:2.15.2"
50+
api "com.fasterxml.jackson.core:jackson-annotations:2.19.2"
51+
api "com.fasterxml.jackson.core:jackson-core:2.19.2"
52+
api "com.fasterxml.jackson.core:jackson-databind:2.19.2"
5353

54-
implementation 'com.google.code.gson:gson:2.11.0'
54+
implementation 'com.google.code.gson:gson:2.13.1'
5555

5656
// This is needed to use wpilibj Filesystem class
5757
testImplementation 'edu.wpi.first.cscore:cscore-java:2025.+'
5858
testImplementation 'edu.wpi.first.cameraserver:cameraserver-java:2025.+'
5959
testImplementation 'edu.wpi.first.hal:hal-java:2025.+'
6060

61-
testImplementation 'us.hebi.quickbuf:quickbuf-runtime:1.3.3'
61+
testImplementation 'us.hebi.quickbuf:quickbuf-runtime:1.4'
6262

63-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
64-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.1'
65-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
63+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
64+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.13.4'
65+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
6666
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
6767
}
6868

@@ -73,7 +73,7 @@ test {
7373
systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true'
7474
testLogging {
7575
events "failed"
76-
exceptionFormat "full"
76+
exceptionFormat = "full"
7777
}
7878
}
7979

@@ -179,7 +179,7 @@ spotless {
179179
exclude '**/build/**', '**/build-*/**'
180180
}
181181
greclipse()
182-
indentWithSpaces(4)
182+
leadingTabsToSpaces(4)
183183
trimTrailingWhitespace()
184184
endWithNewline()
185185
}
@@ -189,7 +189,7 @@ spotless {
189189
exclude '**/build/**', '**/build-*/**'
190190
}
191191
trimTrailingWhitespace()
192-
indentWithSpaces(4)
192+
leadingTabsToSpaces(4)
193193
endWithNewline()
194194
}
195195
}
@@ -233,5 +233,5 @@ test {
233233
apply from: 'publish.gradle'
234234

235235
wrapper {
236-
gradleVersion '8.11'
236+
gradleVersion = '8.14.3'
237237
}
181 Bytes
Binary file not shown.

choreolib/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.11-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

choreolib/gradlew

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# 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
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

choreolib/gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

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

7575

7676
@rem Execute Gradle
77-
"%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" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

choreolib/publish.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ task libraryBuild() {}
2828
build.dependsOn outputVersions
2929

3030
task copyAllOutputs(type: Copy) {
31-
destinationDir file("$buildDir/allOutputs")
31+
destinationDir = file("$buildDir/allOutputs")
3232
from versionFile
3333
dependsOn outputVersions
3434
}
@@ -165,8 +165,8 @@ model {
165165
artifact cppSourceZip
166166

167167
artifactId = "${baseArtifactId}-cpp"
168-
groupId artifactGroupId
169-
version pubVersion
168+
groupId = artifactGroupId
169+
version = pubVersion
170170
}
171171

172172
java(MavenPublication) {
@@ -175,8 +175,8 @@ model {
175175
artifact javadocJar
176176

177177
artifactId = "${baseArtifactId}-java"
178-
groupId artifactGroupId
179-
version pubVersion
178+
groupId = artifactGroupId
179+
version = pubVersion
180180
}
181181
}
182182
}

0 commit comments

Comments
 (0)