Merge branch 'main' into 2027

This commit is contained in:
Peter Johnson
2025-08-09 00:00:53 -07:00
133 changed files with 304 additions and 279 deletions

View File

@@ -65,18 +65,19 @@ publishing {
artifact javadocJar
artifactId = "${baseArtifactId}-java"
groupId artifactGroupId
version wpilibVersioning.version.get()
groupId = artifactGroupId
version = wpilibVersioning.version.get()
}
}
}
test {
jvmArgs '--enable-native-access=ALL-UNNAMED'
useJUnitPlatform()
systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true'
testLogging {
events "failed"
exceptionFormat "full"
exceptionFormat = "full"
}
finalizedBy jacocoTestReport
}
@@ -118,7 +119,7 @@ tasks.withType(JavaCompile).configureEach {
}
dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
devImplementation sourceSets.main.output
@@ -133,7 +134,7 @@ task run(type: JavaExec) {
build.dependsOn devClasses
jacoco {
toolVersion = "0.8.10"
toolVersion = "0.8.13"
}
jacocoTestReport {

View File

@@ -5,7 +5,7 @@ if (project.hasProperty('skipJavaFormat')) {
apply plugin: 'checkstyle'
checkstyle {
toolVersion = "10.26.1"
toolVersion = "11.0.0"
configDirectory = file("${project.rootDir}/styleguide")
config = resources.text.fromFile(new File(configDirectory.get().getAsFile(), "checkstyle.xml"))
}
@@ -13,7 +13,7 @@ checkstyle {
apply plugin: 'pmd'
pmd {
toolVersion = '7.2.0'
toolVersion = '7.16.0'
consoleOutput = true
reportsDir = file("$project.buildDir/reports/pmd")
ruleSetFiles = files(new File(rootDir, "styleguide/pmd-ruleset.xml"))
@@ -40,7 +40,7 @@ spotless {
exclude '**/build/**', '**/build-*/**', '**/bin/**'
}
greclipse()
indentWithSpaces(4)
leadingTabsToSpaces(4)
trimTrailingWhitespace()
endWithNewline()
}
@@ -60,7 +60,7 @@ spotless {
}
eclipseWtp('xml')
trimTrailingWhitespace()
indentWithSpaces(2)
leadingTabsToSpaces(2)
endWithNewline()
}
format 'misc', {
@@ -69,7 +69,7 @@ spotless {
exclude '**/build/**', '**/build-*/**', '**/bin/**'
}
trimTrailingWhitespace()
indentWithSpaces(2)
leadingTabsToSpaces(2)
endWithNewline()
}
}