Skip to content

Commit 112ee68

Browse files
authored
Merge pull request #30 from REVrobotics/2025-kickoff
Update for 2025 kickoff
2 parents fb45ccf + 91fec3f commit 112ee68

File tree

9 files changed

+57
-11
lines changed

9 files changed

+57
-11
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,6 @@ ctre_sim/
182182
# clangd
183183
/.cache
184184
compile_commands.json
185+
186+
# Eclipse generated file for annotation processors
187+
.factorypath

.vscode/settings.json

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,36 @@
2525
}
2626
},
2727
],
28-
"java.test.defaultConfig": "WPIlibUnitTests"
28+
"java.test.defaultConfig": "WPIlibUnitTests",
29+
"java.import.gradle.annotationProcessing.enabled": false,
30+
"java.completion.favoriteStaticMembers": [
31+
"org.junit.Assert.*",
32+
"org.junit.Assume.*",
33+
"org.junit.jupiter.api.Assertions.*",
34+
"org.junit.jupiter.api.Assumptions.*",
35+
"org.junit.jupiter.api.DynamicContainer.*",
36+
"org.junit.jupiter.api.DynamicTest.*",
37+
"org.mockito.Mockito.*",
38+
"org.mockito.ArgumentMatchers.*",
39+
"org.mockito.Answers.*",
40+
"edu.wpi.first.units.Units.*"
41+
],
42+
"java.completion.filteredTypes": [
43+
"java.awt.*",
44+
"com.sun.*",
45+
"sun.*",
46+
"jdk.*",
47+
"org.graalvm.*",
48+
"io.micrometer.shaded.*",
49+
"java.beans.*",
50+
"java.util.Base64.*",
51+
"java.util.Timer",
52+
"java.sql.*",
53+
"javax.swing.*",
54+
"javax.management.*",
55+
"javax.smartcardio.*",
56+
"edu.wpi.first.math.proto.*",
57+
"edu.wpi.first.math.**.proto.*",
58+
"edu.wpi.first.math.**.struct.*",
59+
]
2960
}

.wpilib/wpilib_preferences.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"enableCppIntellisense": false,
33
"currentLanguage": "java",
4-
"projectYear": "2025beta",
4+
"projectYear": "2025",
55
"teamNumber": 2714
66
}

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# MAXSwerve Java Template Changelog
22

3+
## [2025.1] - 2025-01-04
4+
5+
- Updates project for kickoff releases
6+
- Adds usage reporting
7+
38
## [2025.0] - 2024-11-07
49

510
- Updates project for 2025 FRC season

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# MAXSwerve Java Template v2025.0
1+
# MAXSwerve Java Template v2025.1
22

33
See [the online changelog](https://github.com/REVrobotics/MAXSwerve-Java-Template/blob/main/CHANGELOG.md) for information about updates to the template that may have been released since you created your project.
44

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1"
3+
id "edu.wpi.first.GradleRIO" version "2025.1.1"
44
}
55

66
java {
@@ -33,6 +33,8 @@ deploy {
3333
frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
3434
files = project.fileTree('src/main/deploy')
3535
directory = '/home/lvuser/deploy'
36+
deleteOldFiles = false // Change to true to delete files on roboRIO that no
37+
// longer exist in deploy directory of this project
3638
}
3739
}
3840
}

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

src/main/java/frc/robot/subsystems/DriveSubsystem.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
package frc.robot.subsystems;
66

7+
import edu.wpi.first.hal.FRCNetComm.tInstances;
8+
import edu.wpi.first.hal.FRCNetComm.tResourceType;
9+
import edu.wpi.first.hal.HAL;
710
import edu.wpi.first.math.geometry.Pose2d;
811
import edu.wpi.first.math.geometry.Rotation2d;
912
import edu.wpi.first.math.kinematics.ChassisSpeeds;
@@ -54,6 +57,8 @@ public class DriveSubsystem extends SubsystemBase {
5457

5558
/** Creates a new DriveSubsystem. */
5659
public DriveSubsystem() {
60+
// Usage reporting for MAXSwerve template
61+
HAL.report(tResourceType.kResourceType_RobotDrive, tInstances.kRobotDriveSwerve_MaxSwerve);
5762
}
5863

5964
@Override

vendordeps/REVLib-2025.0.0-beta-2.json renamed to vendordeps/REVLib-2025.0.0.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"fileName": "REVLib-2025.0.0-beta-2.json",
2+
"fileName": "REVLib-2025.0.0.json",
33
"name": "REVLib",
4-
"version": "2025.0.0-beta-2",
4+
"version": "2025.0.0",
55
"frcYear": "2025",
66
"uuid": "3f48eb8c-50fe-43a6-9cb7-44c86353c4cb",
77
"mavenUrls": [
@@ -12,14 +12,14 @@
1212
{
1313
"groupId": "com.revrobotics.frc",
1414
"artifactId": "REVLib-java",
15-
"version": "2025.0.0-beta-2"
15+
"version": "2025.0.0"
1616
}
1717
],
1818
"jniDependencies": [
1919
{
2020
"groupId": "com.revrobotics.frc",
2121
"artifactId": "REVLib-driver",
22-
"version": "2025.0.0-beta-2",
22+
"version": "2025.0.0",
2323
"skipInvalidPlatforms": true,
2424
"isJar": false,
2525
"validPlatforms": [
@@ -37,7 +37,7 @@
3737
{
3838
"groupId": "com.revrobotics.frc",
3939
"artifactId": "REVLib-cpp",
40-
"version": "2025.0.0-beta-2",
40+
"version": "2025.0.0",
4141
"libName": "REVLib",
4242
"headerClassifier": "headers",
4343
"sharedLibrary": false,
@@ -55,7 +55,7 @@
5555
{
5656
"groupId": "com.revrobotics.frc",
5757
"artifactId": "REVLib-driver",
58-
"version": "2025.0.0-beta-2",
58+
"version": "2025.0.0",
5959
"libName": "REVLibDriver",
6060
"headerClassifier": "headers",
6161
"sharedLibrary": false,

0 commit comments

Comments
 (0)