From 48980712bcfafe979c6f1057c9767a113bfea43e Mon Sep 17 00:00:00 2001 From: Jan-Felix Abellera Date: Sat, 4 Jan 2025 15:49:53 -0600 Subject: [PATCH 1/4] Import to wpilib 2025.1.1 --- .gitignore | 3 +++ .vscode/settings.json | 33 +++++++++++++++++++++++- .wpilib/wpilib_preferences.json | 2 +- build.gradle | 4 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 375359c2..34cbaac1 100644 --- a/.gitignore +++ b/.gitignore @@ -182,3 +182,6 @@ ctre_sim/ # clangd /.cache compile_commands.json + +# Eclipse generated file for annotation processors +.factorypath diff --git a/.vscode/settings.json b/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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.*", + ] } diff --git a/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json index 0b2ed183..014e417f 100644 --- a/.wpilib/wpilib_preferences.json +++ b/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": 2714 } \ No newline at end of file diff --git a/build.gradle b/build.gradle index ec028da5..81c0f3ba 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-1" + id "edu.wpi.first.GradleRIO" version "2025.1.1" } java { @@ -33,6 +33,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 } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fbacf711..34bd9ce9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=permwrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From f333495ac37a675410783b6ab2732afa3ac6c2f4 Mon Sep 17 00:00:00 2001 From: Jan-Felix Abellera Date: Sat, 4 Jan 2025 15:54:31 -0600 Subject: [PATCH 2/4] Update to REVLib 2025.0.0 --- ...Lib-2025.0.0-beta-2.json => REVLib-2025.0.0.json} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename vendordeps/{REVLib-2025.0.0-beta-2.json => REVLib-2025.0.0.json} (88%) diff --git a/vendordeps/REVLib-2025.0.0-beta-2.json b/vendordeps/REVLib-2025.0.0.json similarity index 88% rename from vendordeps/REVLib-2025.0.0-beta-2.json rename to vendordeps/REVLib-2025.0.0.json index 85f61514..cde60117 100644 --- a/vendordeps/REVLib-2025.0.0-beta-2.json +++ b/vendordeps/REVLib-2025.0.0.json @@ -1,7 +1,7 @@ { - "fileName": "REVLib-2025.0.0-beta-2.json", + "fileName": "REVLib-2025.0.0.json", "name": "REVLib", - "version": "2025.0.0-beta-2", + "version": "2025.0.0", "frcYear": "2025", "uuid": "3f48eb8c-50fe-43a6-9cb7-44c86353c4cb", "mavenUrls": [ @@ -12,14 +12,14 @@ { "groupId": "com.revrobotics.frc", "artifactId": "REVLib-java", - "version": "2025.0.0-beta-2" + "version": "2025.0.0" } ], "jniDependencies": [ { "groupId": "com.revrobotics.frc", "artifactId": "REVLib-driver", - "version": "2025.0.0-beta-2", + "version": "2025.0.0", "skipInvalidPlatforms": true, "isJar": false, "validPlatforms": [ @@ -37,7 +37,7 @@ { "groupId": "com.revrobotics.frc", "artifactId": "REVLib-cpp", - "version": "2025.0.0-beta-2", + "version": "2025.0.0", "libName": "REVLib", "headerClassifier": "headers", "sharedLibrary": false, @@ -55,7 +55,7 @@ { "groupId": "com.revrobotics.frc", "artifactId": "REVLib-driver", - "version": "2025.0.0-beta-2", + "version": "2025.0.0", "libName": "REVLibDriver", "headerClassifier": "headers", "sharedLibrary": false, From 12c6fe03cbbe058768738ac9a4a7464d0e4b9361 Mon Sep 17 00:00:00 2001 From: Jan-Felix Abellera Date: Sat, 4 Jan 2025 16:15:54 -0600 Subject: [PATCH 3/4] Add usage reporting --- src/main/java/frc/robot/subsystems/DriveSubsystem.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/frc/robot/subsystems/DriveSubsystem.java b/src/main/java/frc/robot/subsystems/DriveSubsystem.java index fdcf7c29..3cb2254e 100644 --- a/src/main/java/frc/robot/subsystems/DriveSubsystem.java +++ b/src/main/java/frc/robot/subsystems/DriveSubsystem.java @@ -4,6 +4,9 @@ package frc.robot.subsystems; +import edu.wpi.first.hal.FRCNetComm.tInstances; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.math.geometry.Pose2d; import edu.wpi.first.math.geometry.Rotation2d; import edu.wpi.first.math.kinematics.ChassisSpeeds; @@ -54,6 +57,8 @@ public class DriveSubsystem extends SubsystemBase { /** Creates a new DriveSubsystem. */ public DriveSubsystem() { + // Usage reporting for MAXSwerve template + HAL.report(tResourceType.kResourceType_RobotDrive, tInstances.kRobotDriveSwerve_MaxSwerve); } @Override From 91fec3ff60471c491c2121b8554d962e84ed6430 Mon Sep 17 00:00:00 2001 From: Jan-Felix Abellera Date: Sat, 4 Jan 2025 16:18:06 -0600 Subject: [PATCH 4/4] Update version and changelog --- CHANGELOG.md | 5 +++++ README.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d39f207..4b429b1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # MAXSwerve Java Template Changelog +## [2025.1] - 2025-01-04 + +- Updates project for kickoff releases +- Adds usage reporting + ## [2025.0] - 2024-11-07 - Updates project for 2025 FRC season diff --git a/README.md b/README.md index 38bf1ae8..e5d2455e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MAXSwerve Java Template v2025.0 +# MAXSwerve Java Template v2025.1 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.