Skip to content

Commit

Permalink
Update to Choreo beta-9 and WPILib beta-3
Browse files Browse the repository at this point in the history
  • Loading branch information
@bhall-ctre
bhall-ctre committed Dec 20, 2024
1 parent ea6ff3c commit cbd1eae
Show file tree
Hide file tree
Showing 58 changed files with 726 additions and 169 deletions.
4 changes: 2 additions & 2 deletions .automation/cpp_template/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
33 changes: 32 additions & 1 deletion .automation/java_template/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,36 @@
}
},
],
"java.test.defaultConfig": "WPIlibUnitTests"
"java.test.defaultConfig": "WPIlibUnitTests",
"java.import.gradle.annotationProcessing.enabled": false,
"java.completion.favoriteStaticMembers": [
"org.junit.Assert.*",
"org.junit.Assume.*",
"org.junit.jupiter.api.Assertions.*",
"org.junit.jupiter.api.Assumptions.*",
"org.junit.jupiter.api.DynamicContainer.*",
"org.junit.jupiter.api.DynamicTest.*",
"org.mockito.Mockito.*",
"org.mockito.ArgumentMatchers.*",
"org.mockito.Answers.*",
"edu.wpi.first.units.Units.*"
],
"java.completion.filteredTypes": [
"java.awt.*",
"com.sun.*",
"sun.*",
"jdk.*",
"org.graalvm.*",
"io.micrometer.shaded.*",
"java.beans.*",
"java.util.Base64.*",
"java.util.Timer",
"java.sql.*",
"javax.swing.*",
"javax.management.*",
"javax.smartcardio.*",
"edu.wpi.first.math.proto.*",
"edu.wpi.first.math.**.proto.*",
"edu.wpi.first.math.**.struct.*",
]
}
4 changes: 2 additions & 2 deletions .automation/java_template/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

java {
Expand Down Expand Up @@ -34,7 +34,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/ArcadeDrive/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/BasicLatencyCompensation/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/CANcoder/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/CommandBasedDrive/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/ControlRequestLimits/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/CurrentLimits/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/FusedCANcoder/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/MotionMagic/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/PhoenixSysId/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/Pigeon2/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/PositionClosedLoop/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/Simulation/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions cpp/SwerveWithPathPlanner/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -27,8 +27,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 on roboRIO
deleteOldFiles = true // Change to true to delete files on roboRIO that no
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/VelocityClosedLoop/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions cpp/WaitForAll/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand All @@ -28,7 +28,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
33 changes: 32 additions & 1 deletion java/ArcadeDrive/.vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,36 @@
}
},
],
"java.test.defaultConfig": "WPIlibUnitTests"
"java.test.defaultConfig": "WPIlibUnitTests",
"java.import.gradle.annotationProcessing.enabled": false,
"java.completion.favoriteStaticMembers": [
"org.junit.Assert.*",
"org.junit.Assume.*",
"org.junit.jupiter.api.Assertions.*",
"org.junit.jupiter.api.Assumptions.*",
"org.junit.jupiter.api.DynamicContainer.*",
"org.junit.jupiter.api.DynamicTest.*",
"org.mockito.Mockito.*",
"org.mockito.ArgumentMatchers.*",
"org.mockito.Answers.*",
"edu.wpi.first.units.Units.*"
],
"java.completion.filteredTypes": [
"java.awt.*",
"com.sun.*",
"sun.*",
"jdk.*",
"org.graalvm.*",
"io.micrometer.shaded.*",
"java.beans.*",
"java.util.Base64.*",
"java.util.Timer",
"java.sql.*",
"javax.swing.*",
"javax.management.*",
"javax.smartcardio.*",
"edu.wpi.first.math.proto.*",
"edu.wpi.first.math.**.proto.*",
"edu.wpi.first.math.**.struct.*",
]
}
4 changes: 2 additions & 2 deletions java/ArcadeDrive/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
}

java {
Expand Down Expand Up @@ -34,7 +34,7 @@ deploy {
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 on roboRIO
// longer exist in deploy directory of this project
}
}
}
Expand Down
Loading

0 comments on commit cbd1eae

Please sign in to comment.