Merge pull request #107 from DeepBlueRobotics/2025

Author: timtogan

.github/workflows/javadoc.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Generate Javadoc
       run: ./gradlew javadoc
     - name: Build Artifact
-      uses: actions/upload-pages-artifact@v3
+      uses: actions/upload-pages-artifact@v4
       with:
         path: ./build/docs/javadoc
   deploy-javadoc:

.wpilib/wpilib_preferences.json

@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": false,
     "currentLanguage": "java",
-    "projectYear": "2024",
+    "projectYear": "2025",
     "teamNumber": 199
 }

WPILib-License.md

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2023 FIRST and other WPILib contributors
+Copyright (c) 2009-2024 FIRST and other WPILib contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.3.1"
+    id "edu.wpi.first.GradleRIO" version "2025.3.2"
     id "maven-publish"
     id "eclipse"
 }
@@ -11,7 +11,6 @@ java {
 }
 
 group 'org.carlmontrobotics'
-
 def ROBOT_MAIN_CLASS = ""
 
 // Define my targets (RoboRIO) and artifacts (deployable files)
@@ -37,6 +36,8 @@ deploy {
                 frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
                     files = project.fileTree('src/main/deploy')
                     directory = '/home/lvuser/deploy'
+                    deleteOldFiles = false // Change to true to delete files on roboRIO that no
+                                           // longer exist in deploy directory of this project
                 }
             }
         }
@@ -54,6 +55,7 @@ def includeDesktopSupport = true
 // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
 // Also defines JUnit 5.
 dependencies {
+    annotationProcessor wpi.java.deps.wpilibAnnotations()
     implementation wpi.java.deps.wpilib()
     implementation wpi.java.vendor.java()
 
@@ -71,17 +73,24 @@ dependencies {
     nativeRelease wpi.java.vendor.jniRelease(wpi.platforms.desktop)
     simulationRelease wpi.sim.enableRelease()
 
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testImplementation 'junit:junit:4.13.2'
 
     implementation 'org.mockito:mockito-core:5.11.0'
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.6'
 }
 
+test {
+    useJUnitPlatform()
+    systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true'
+}
+
 // Simulation configuration (e.g. environment variables).
 wpi.sim.addGui().defaultEnabled = true
 wpi.sim.addDriverstation()
 
-// Setting up my Jar File. 
+// Setting up my Jar File.
 jar {
     // Note: Do NOT add all the libraries to the jar. Doing so will cause robot programs to have
     // 2 copies of each of the libraries classes, one from lib199 and one from the robot program.
@@ -111,21 +120,20 @@ deployArtifact.jarTask = jar
 wpi.java.configureExecutableTasks(jar)
 wpi.java.configureTestTasks(test)
 
-// Configure string concat to always inline compile
-tasks.withType(JavaCompile) {
-    options.compilerArgs.add '-XDstringConcat=inline'
-}
-
 // Allow the generated javadocs to link to the documentation of WPILib and vendor libraries
 javadoc {
     options.with {
         links 'https://github.wpilib.org/allwpilib/docs/release/java/'
         links 'https://www.kauailabs.com/public_files/navx-mxp/apidocs/java/'
         links 'https://pathplanner.dev/api/java/'
-        links 'https://api.ctr-electronics.com/phoenix/release/java/'
-        links 'https://api.ctr-electronics.com/phoenix6/release/java/'
+        links 'https://api.ctr-electronics.com/phoenix/stable/java/'
+        links 'https://api.ctr-electronics.com/phoenix6/stable/java/'
         links 'https://www.playingwithfusion.com/frc/2022/javadoc/'
         links 'https://codedocs.revrobotics.com/java/'
     }
 }
 
+// Configure string concat to always inline compile
+tasks.withType(JavaCompile) {
+    options.compilerArgs.add '-XDstringConcat=inline'
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=permwrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -4,7 +4,7 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        String frcYear = '2024'
+        String frcYear = '2025'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')
@@ -20,8 +20,8 @@ pluginManagement {
         }
         def frcHomeMaven = new File(frcHome, 'maven')
         maven {
-            name 'frcHome'
-            url frcHomeMaven
+            name = 'frcHome'
+            url = frcHomeMaven
         }
     }
 }