From df25d64eea92a4adc48781c5ab096c9d82648c97 Mon Sep 17 00:00:00 2001 From: Alex Resnick Date: Thu, 2 Jan 2025 13:03:31 -0600 Subject: [PATCH] update to 2025.1.1, breaks everything :( --- .gitignore | 3 +++ .vscode/settings.json | 33 ++++++++++++++++++++++++++++++++- .wpilib/wpilib_preferences.json | 2 +- build.gradle | 15 ++------------- 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 54b8749..3bd8f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -190,3 +190,6 @@ simgui-ds.json # clangd /.cache compile_commands.json + +# Eclipse generated file for annotation processors +.factorypath diff --git a/.vscode/settings.json b/.vscode/settings.json index ded1ec5..2a192e8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -28,6 +28,37 @@ }, ], "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.*", + ], "java.format.settings.url": "formatter.xml", "java.format.settings.profile": "GoogleStyle", "[java]": { @@ -39,4 +70,4 @@ "editor.formatOnSave": true, "editor.formatOnPaste": true, "terminal.integrated.defaultProfile.windows": "Git Bash" -} +} \ No newline at end of file diff --git a/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json index adf70ca..81736c3 100644 --- a/.wpilib/wpilib_preferences.json +++ b/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": 5572 } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 40bf5aa..8984c04 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" + id "edu.wpi.first.GradleRIO" version "2025.1.1" id "com.peterabeles.gversion" version "1.10" } @@ -35,7 +35,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 } } } @@ -64,17 +64,6 @@ repositories { mavenLocal() maven { url 'https://jitpack.io' } } - -// configurations.all { -// exclude group: "edu.wpi.first.wpilibj" -// } - -// task(checkAkitInstall, dependsOn: "classes", type: JavaExec) { -// mainClass = "org.littletonrobotics.junction.CheckInstall" -// classpath = sourceSets.main.runtimeClasspath -// } -// compileJava.finalizedBy checkAkitInstall - dependencies { def akitJson = new groovy.json.JsonSlurper().parseText(new File(projectDir.getAbsolutePath() + "/vendordeps/AdvantageKit.json").text) annotationProcessor "org.littletonrobotics.akit:akit-autolog:$akitJson.version"