diff --git a/build.gradle b/build.gradle index 6175e19b0f..72ccf2c438 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id "cpp" id "com.diffplug.spotless" version "6.24.0" id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2" - id "edu.wpi.first.GradleRIO" version "2025.2.1" + id "edu.wpi.first.GradleRIO" version "2025.3.1" id 'edu.wpi.first.WpilibTools' version '1.3.0' id 'com.google.protobuf' version '0.9.3' apply false id 'edu.wpi.first.GradleJni' version '1.1.0' @@ -33,7 +33,7 @@ ext.allOutputsFolder = file("$project.buildDir/outputs") apply from: "versioningHelper.gradle" ext { - wpilibVersion = "2025.2.1" + wpilibVersion = "2025.3.1" wpimathVersion = wpilibVersion openCVYear = "2025" openCVversion = "4.10.0-3" diff --git a/docs/source/docs/advanced-installation/sw_install/windows-pc.md b/docs/source/docs/advanced-installation/sw_install/windows-pc.md index 33f2ec808d..653297fd65 100644 --- a/docs/source/docs/advanced-installation/sw_install/windows-pc.md +++ b/docs/source/docs/advanced-installation/sw_install/windows-pc.md @@ -12,7 +12,7 @@ Bonjour provides more stable networking when using Windows PCs. Install [Bonjour ## Installing Java -PhotonVision requires a JDK installed and on the system path. **JDK 17 is needed. Windows Users must use the JDK that ships with WPILib.** [Download and install it from here.](https://github.com/wpilibsuite/allwpilib/releases/tag/v2025.2.1) Either ensure the only Java on your PATH is the WPILIB Java or specify it to gradle with `-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk`: +PhotonVision requires a JDK installed and on the system path. **JDK 17 is needed. Windows Users must use the JDK that ships with WPILib.** [Download and install it from here.](https://github.com/wpilibsuite/allwpilib/releases/tag/v2025.3.1) Either ensure the only Java on your PATH is the WPILIB Java or specify it to gradle with `-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk`: ``` > ./gradlew run "-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk" diff --git a/photon-lib/py/setup.py b/photon-lib/py/setup.py index abd8865a89..2eca4f9d02 100644 --- a/photon-lib/py/setup.py +++ b/photon-lib/py/setup.py @@ -59,11 +59,11 @@ version=versionString, install_requires=[ "numpy~=2.1", - "wpilib<2026,>=2025.2.1", - "robotpy-wpimath<2026,>=2025.2.1", - "robotpy-apriltag<2026,>=2025.2.1", - "robotpy-cscore<2026,>=2025.2.1", - "pyntcore<2026,>=2025.2.1", + "wpilib<2026,>=2025.3.1", + "robotpy-wpimath<2026,>=2025.3.1", + "robotpy-apriltag<2026,>=2025.3.1", + "robotpy-cscore<2026,>=2025.3.1", + "pyntcore<2026,>=2025.3.1", "opencv-python;platform_machine!='roborio'", ], description=descriptionStr, diff --git a/photonlib-cpp-examples/aimandrange/build.gradle b/photonlib-cpp-examples/aimandrange/build.gradle index 4e962e6e5f..2d37126eaa 100644 --- a/photonlib-cpp-examples/aimandrange/build.gradle +++ b/photonlib-cpp-examples/aimandrange/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.2.1" + id "edu.wpi.first.GradleRIO" version "2025.3.1" } repositories { @@ -11,8 +11,8 @@ repositories { wpi.maven.useLocal = false wpi.maven.useDevelopment = false -wpi.versions.wpilibVersion = "2025.2.1" -wpi.versions.wpimathVersion = "2025.2.1" +wpi.versions.wpilibVersion = "2025.3.1" +wpi.versions.wpimathVersion = "2025.3.1" // Define my targets (RoboRIO) and artifacts (deployable files) // This is added by GradleRIO's backing project DeployUtils. diff --git a/photonlib-cpp-examples/aimattarget/build.gradle b/photonlib-cpp-examples/aimattarget/build.gradle index 4e962e6e5f..2d37126eaa 100644 --- a/photonlib-cpp-examples/aimattarget/build.gradle +++ b/photonlib-cpp-examples/aimattarget/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.2.1" + id "edu.wpi.first.GradleRIO" version "2025.3.1" } repositories { @@ -11,8 +11,8 @@ repositories { wpi.maven.useLocal = false wpi.maven.useDevelopment = false -wpi.versions.wpilibVersion = "2025.2.1" -wpi.versions.wpimathVersion = "2025.2.1" +wpi.versions.wpilibVersion = "2025.3.1" +wpi.versions.wpimathVersion = "2025.3.1" // Define my targets (RoboRIO) and artifacts (deployable files) // This is added by GradleRIO's backing project DeployUtils. diff --git a/photonlib-cpp-examples/poseest/build.gradle b/photonlib-cpp-examples/poseest/build.gradle index 4e962e6e5f..2d37126eaa 100644 --- a/photonlib-cpp-examples/poseest/build.gradle +++ b/photonlib-cpp-examples/poseest/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.2.1" + id "edu.wpi.first.GradleRIO" version "2025.3.1" } repositories { @@ -11,8 +11,8 @@ repositories { wpi.maven.useLocal = false wpi.maven.useDevelopment = false -wpi.versions.wpilibVersion = "2025.2.1" -wpi.versions.wpimathVersion = "2025.2.1" +wpi.versions.wpilibVersion = "2025.3.1" +wpi.versions.wpimathVersion = "2025.3.1" // Define my targets (RoboRIO) and artifacts (deployable files) // This is added by GradleRIO's backing project DeployUtils. diff --git a/photonlib-java-examples/aimandrange/build.gradle b/photonlib-java-examples/aimandrange/build.gradle index 07bdaa1adb..7d59212292 100644 --- a/photonlib-java-examples/aimandrange/build.gradle +++ b/photonlib-java-examples/aimandrange/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.2.1" + id "edu.wpi.first.GradleRIO" version "2025.3.1" } sourceCompatibility = JavaVersion.VERSION_17 @@ -13,8 +13,8 @@ repositories { } wpi.maven.useDevelopment = true -wpi.versions.wpilibVersion = "2025.2.1" -wpi.versions.wpimathVersion = "2025.2.1" +wpi.versions.wpilibVersion = "2025.3.1" +wpi.versions.wpimathVersion = "2025.3.1" // Define my targets (RoboRIO) and artifacts (deployable files) diff --git a/photonlib-java-examples/aimattarget/build.gradle b/photonlib-java-examples/aimattarget/build.gradle index 327080ddb5..cf526cea78 100644 --- a/photonlib-java-examples/aimattarget/build.gradle +++ b/photonlib-java-examples/aimattarget/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.2.1" + id "edu.wpi.first.GradleRIO" version "2025.3.1" } sourceCompatibility = JavaVersion.VERSION_17 @@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_17 def ROBOT_MAIN_CLASS = "frc.robot.Main" wpi.maven.useDevelopment = true -wpi.versions.wpilibVersion = "2025.2.1" -wpi.versions.wpimathVersion = "2025.2.1" +wpi.versions.wpilibVersion = "2025.3.1" +wpi.versions.wpimathVersion = "2025.3.1" // Define my targets (RoboRIO) and artifacts (deployable files) diff --git a/photonlib-java-examples/poseest/build.gradle b/photonlib-java-examples/poseest/build.gradle index 8588cb44f6..525be00be9 100644 --- a/photonlib-java-examples/poseest/build.gradle +++ b/photonlib-java-examples/poseest/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.2.1" + id "edu.wpi.first.GradleRIO" version "2025.3.1" } sourceCompatibility = JavaVersion.VERSION_17 @@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_17 def ROBOT_MAIN_CLASS = "frc.robot.Main" wpi.maven.useDevelopment = true -wpi.versions.wpilibVersion = "2025.2.1" -wpi.versions.wpimathVersion = "2025.2.1" +wpi.versions.wpilibVersion = "2025.3.1" +wpi.versions.wpimathVersion = "2025.3.1" // Define my targets (RoboRIO) and artifacts (deployable files) diff --git a/photonlib-python-examples/aimandrange/pyproject.toml b/photonlib-python-examples/aimandrange/pyproject.toml index 82e9332bfc..4b5a0262ac 100644 --- a/photonlib-python-examples/aimandrange/pyproject.toml +++ b/photonlib-python-examples/aimandrange/pyproject.toml @@ -6,7 +6,7 @@ [tool.robotpy] # Version of robotpy this project depends on -robotpy_version = "2025.2.1" +robotpy_version = "2025.3.1" # Which extra RobotPy components should be installed # -> equivalent to `pip install robotpy[extra1, ...] diff --git a/photonlib-python-examples/aimattarget/pyproject.toml b/photonlib-python-examples/aimattarget/pyproject.toml index 82e9332bfc..4b5a0262ac 100644 --- a/photonlib-python-examples/aimattarget/pyproject.toml +++ b/photonlib-python-examples/aimattarget/pyproject.toml @@ -6,7 +6,7 @@ [tool.robotpy] # Version of robotpy this project depends on -robotpy_version = "2025.2.1" +robotpy_version = "2025.3.1" # Which extra RobotPy components should be installed # -> equivalent to `pip install robotpy[extra1, ...] diff --git a/photonlib-python-examples/poseest/pyproject.toml b/photonlib-python-examples/poseest/pyproject.toml index 82e9332bfc..4b5a0262ac 100644 --- a/photonlib-python-examples/poseest/pyproject.toml +++ b/photonlib-python-examples/poseest/pyproject.toml @@ -6,7 +6,7 @@ [tool.robotpy] # Version of robotpy this project depends on -robotpy_version = "2025.2.1" +robotpy_version = "2025.3.1" # Which extra RobotPy components should be installed # -> equivalent to `pip install robotpy[extra1, ...]