Skip to content

Commit 4898071

Browse files
committed
Import to wpilib 2025.1.1
1 parent fb45ccf commit 4898071

File tree

5 files changed

+40
-4
lines changed

5 files changed

+40
-4
lines changed

.gitignore

+3
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

+32-1
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

+1-1
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
}

build.gradle

+3-1
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

+1-1
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

0 commit comments

Comments
 (0)