Skip to content

Commit 869b318

Browse files
committed
Update dependencies
Signed-off-by: Taylor Smock <tsmock@meta.com>
1 parent d2ca6b2 commit 869b318

File tree

5 files changed

+32
-27
lines changed

5 files changed

+32
-27
lines changed

build.gradle.kts

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import kotlin.reflect.full.starProjectedType
1212

1313
plugins {
1414
id("application")
15-
id("com.diffplug.spotless") version "6.20.0"
16-
id("com.github.ben-manes.versions") version "0.47.0"
17-
id("com.github.spotbugs") version "5.0.14"
15+
id("com.diffplug.spotless") version "6.25.0"
16+
id("com.github.ben-manes.versions") version "0.51.0"
17+
id("com.github.spotbugs") version "6.0.12"
1818
id("net.ltgt.errorprone") version "3.1.0"
1919
id("org.openstreetmap.josm") version "0.8.2"
2020
id("org.sonarqube") version "4.3.0.3225"
@@ -56,21 +56,17 @@ java.sourceCompatibility = JavaVersion.VERSION_17
5656
java.targetCompatibility = JavaVersion.VERSION_17
5757

5858
val versions = mapOf(
59-
"awaitility" to "4.2.0",
60-
// Errorprone 2.11 requires Java 11+
61-
"errorprone" to if (JavaVersion.current() >= JavaVersion.VERSION_11) "2.20.0" else "2.10.0",
59+
"awaitility" to "4.2.1",
60+
"errorprone" to "2.26.1",
6261
"jdatepicker" to "1.3.4",
6362
"jmockit" to "1.49",
64-
"junit" to "5.9.3",
63+
"junit" to "5.10.2",
6564
"pmd" to "6.42.0",
66-
"spotbugs" to "4.7.3",
67-
"wiremock" to "2.35.0"
65+
"spotbugs" to "4.8.4",
66+
"wiremock" to "2.35.1"
6867
)
6968

7069
dependencies {
71-
if (!JavaVersion.current().isJava9Compatible) {
72-
errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
73-
}
7470
errorprone("com.google.errorprone:error_prone_core:${versions["errorprone"]}")
7571
testImplementation ("org.openstreetmap.josm:josm-unittest:SNAPSHOT"){ isChanging = true }
7672
testImplementation("com.github.tomakehurst:wiremock-jre8:${versions["wiremock"]}")
@@ -255,23 +251,21 @@ project.afterEvaluate {
255251

256252
// Spotbugs config
257253
spotbugs {
258-
toolVersion.set("4.0.6")
259254
ignoreFailures.set(true)
260255
effort.set(Effort.MAX)
261256
reportLevel.set(Confidence.LOW)
262-
reportsDir.set(File(buildDir, "reports/spotbugs"))
257+
reportsDir = file("$buildDir/reports/spotbugs")
263258
}
264259
tasks.withType(SpotBugsTask::class) {
265260
reports.create("html") {
266-
outputLocation.set(File(spotbugs.reportsDir.get().asFile, "$baseName.html"))
267-
setStylesheet("color.xsl")
261+
setStylesheet("fancy-hist.xsl")
268262
}
269263
}
270264

271265

272266
// JaCoCo config
273267
jacoco {
274-
toolVersion = "0.8.10"
268+
toolVersion = "0.8.12"
275269
}
276270

277271
tasks.jacocoTestReport {

gradle/wrapper/gradle-wrapper.jar

2.56 KB
Binary file not shown.
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-
distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
3+
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
5+
networkTimeout=10000
6+
validateDistributionUrl=true
57
zipStoreBase=GRADLE_USER_HOME
68
zipStorePath=wrapper/dists

gradlew

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# Darwin, MinGW, and NonStop.
5656
#
5757
# (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
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5959
# within the Gradle project.
6060
#
6161
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
8080
esac
8181
done
8282

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

9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
@@ -133,22 +130,29 @@ location of your Java installation."
133130
fi
134131
else
135132
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
133+
if ! command -v java >/dev/null 2>&1
134+
then
135+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137136
138137
Please set the JAVA_HOME variable in your environment to match the
139138
location of your Java installation."
139+
fi
140140
fi
141141

142142
# Increase the maximum file descriptors if we can.
143143
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144144
case $MAX_FD in #(
145145
max*)
146+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147+
# shellcheck disable=SC3045
146148
MAX_FD=$( ulimit -H -n ) ||
147149
warn "Could not query maximum file descriptor limit"
148150
esac
149151
case $MAX_FD in #(
150152
'' | soft) :;; #(
151153
*)
154+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155+
# shellcheck disable=SC3045
152156
ulimit -n "$MAX_FD" ||
153157
warn "Could not set maximum file descriptor limit to $MAX_FD"
154158
esac
@@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
193197
done
194198
fi
195199

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

gradlew.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
2828
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
2930
set APP_BASE_NAME=%~n0
3031
set APP_HOME=%DIRNAME%
3132

0 commit comments

Comments
 (0)