Skip to content

Commit a45c54d

Browse files
authored
Import to 2025 (#27)
* Imported to 2025 * wrong version fix
1 parent 99f3682 commit a45c54d

File tree

9 files changed

+54
-18
lines changed

9 files changed

+54
-18
lines changed

.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": "2024beta",
4+
"projectYear": "2025",
55
"teamNumber": 5990
66
}

WPILib-License.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2009-2023 FIRST and other WPILib contributors
1+
Copyright (c) 2009-2024 FIRST and other WPILib contributors
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id "java-library"
33
id "maven-publish"
4-
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3"
4+
id "edu.wpi.first.GradleRIO" version "2025.1.1"
55
id "edu.wpi.first.WpilibTools" version "2.1.0"
66
}
77

gradle/wrapper/gradle-wrapper.jar

-19.7 KB
Binary file not shown.

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.4-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

gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pluginManagement {
44
repositories {
55
mavenLocal()
66
gradlePluginPortal()
7-
String frcYear = '2024'
7+
String frcYear = '2025'
88
File frcHome
99
if (OperatingSystem.current().isWindows()) {
1010
String publicFolder = System.getenv('PUBLIC')

0 commit comments

Comments
 (0)