Skip to content

Commit

Permalink
update to 2025.1.1, breaks everything :(
Browse files Browse the repository at this point in the history
  • Loading branch information
legoguy1000 committed Jan 2, 2025
1 parent e4ad6b6 commit df25d64
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,6 @@ simgui-ds.json
# clangd
/.cache
compile_commands.json

# Eclipse generated file for annotation processors
.factorypath
33 changes: 32 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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]": {
Expand All @@ -39,4 +70,4 @@
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"terminal.integrated.defaultProfile.windows": "Git Bash"
}
}
2 changes: 1 addition & 1 deletion .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"enableCppIntellisense": false,
"currentLanguage": "java",
"projectYear": "2025beta",
"projectYear": "2025",
"teamNumber": 5572
}
15 changes: 2 additions & 13 deletions build.gradle
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-3"
id "edu.wpi.first.GradleRIO" version "2025.1.1"
id "com.peterabeles.gversion" version "1.10"
}

Expand Down Expand Up @@ -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
}
}
}
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit df25d64

Please sign in to comment.