Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-07-04 03:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] Update to stable WPILib (#1674)

Browse Source
This commit is contained in:
Jade
2025-01-03 01:13:38 +08:00
committed by GitHub
parent 3f8c406898
commit a540d2dd3f
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -4,7 +4,7 @@ plugins {
id "cpp" id "cpp"
id "com.diffplug.spotless" version "6.24.0" id "com.diffplug.spotless" version "6.24.0"
id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2" id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" id "edu.wpi.first.GradleRIO" version "2025.1.1"
id 'edu.wpi.first.WpilibTools' version '1.3.0' id 'edu.wpi.first.WpilibTools' version '1.3.0'
id 'com.google.protobuf' version '0.9.3' apply false id 'com.google.protobuf' version '0.9.3' apply false
id 'edu.wpi.first.GradleJni' version '1.1.0' id 'edu.wpi.first.GradleJni' version '1.1.0'
@@ -33,7 +33,7 @@ ext.allOutputsFolder = file("$project.buildDir/outputs")
apply from: "versioningHelper.gradle" apply from: "versioningHelper.gradle"
ext { ext {
wpilibVersion = "2025.1.1-beta-3" wpilibVersion = "2025.1.1"
wpimathVersion = wpilibVersion wpimathVersion = wpilibVersion
openCVYear = "2025" openCVYear = "2025"
openCVversion = "4.10.0-3" openCVversion = "4.10.0-3"

2
docs/source/docs/advanced-installation/sw_install/windows-pc.md
View File

@@ -12,7 +12,7 @@ Bonjour provides more stable networking when using Windows PCs. Install [Bonjour
## Installing Java ## 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.1.1-beta-3) 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.1.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" > ./gradlew run "-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk"

6
photonlib-cpp-examples/aimandrange/build.gradle
View File

@@ -1,7 +1,7 @@
plugins { plugins {
id "cpp" id "cpp"
id "google-test-test-suite" id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" id "edu.wpi.first.GradleRIO" version "2025.1.1"
} }
repositories { repositories {
@@ -11,8 +11,8 @@ repositories {
wpi.maven.useLocal = false wpi.maven.useLocal = false
wpi.maven.useDevelopment = false wpi.maven.useDevelopment = false
wpi.versions.wpilibVersion = "2025.1.1-beta-3" wpi.versions.wpilibVersion = "2025.1.1"
wpi.versions.wpimathVersion = "2025.1.1-beta-3" wpi.versions.wpimathVersion = "2025.1.1"
// Define my targets (RoboRIO) and artifacts (deployable files) // Define my targets (RoboRIO) and artifacts (deployable files)
// This is added by GradleRIO's backing project DeployUtils. // This is added by GradleRIO's backing project DeployUtils.

6
photonlib-cpp-examples/aimattarget/build.gradle
View File

@@ -1,7 +1,7 @@
plugins { plugins {
id "cpp" id "cpp"
id "google-test-test-suite" id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" id "edu.wpi.first.GradleRIO" version "2025.1.1"
} }
repositories { repositories {
@@ -11,8 +11,8 @@ repositories {
wpi.maven.useLocal = false wpi.maven.useLocal = false
wpi.maven.useDevelopment = false wpi.maven.useDevelopment = false
wpi.versions.wpilibVersion = "2025.1.1-beta-3" wpi.versions.wpilibVersion = "2025.1.1"
wpi.versions.wpimathVersion = "2025.1.1-beta-3" wpi.versions.wpimathVersion = "2025.1.1"
// Define my targets (RoboRIO) and artifacts (deployable files) // Define my targets (RoboRIO) and artifacts (deployable files)
// This is added by GradleRIO's backing project DeployUtils. // This is added by GradleRIO's backing project DeployUtils.

6
photonlib-cpp-examples/poseest/build.gradle
View File

@@ -1,7 +1,7 @@
plugins { plugins {
id "cpp" id "cpp"
id "google-test-test-suite" id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" id "edu.wpi.first.GradleRIO" version "2025.1.1"
} }
repositories { repositories {
@@ -11,8 +11,8 @@ repositories {
wpi.maven.useLocal = false wpi.maven.useLocal = false
wpi.maven.useDevelopment = false wpi.maven.useDevelopment = false
wpi.versions.wpilibVersion = "2025.1.1-beta-3" wpi.versions.wpilibVersion = "2025.1.1"
wpi.versions.wpimathVersion = "2025.1.1-beta-3" wpi.versions.wpimathVersion = "2025.1.1"
// Define my targets (RoboRIO) and artifacts (deployable files) // Define my targets (RoboRIO) and artifacts (deployable files)
// This is added by GradleRIO's backing project DeployUtils. // This is added by GradleRIO's backing project DeployUtils.

6
photonlib-java-examples/aimandrange/build.gradle
View File

@@ -1,6 +1,6 @@
plugins { plugins {
id "java" id "java"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" id "edu.wpi.first.GradleRIO" version "2025.1.1"
} }
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
@@ -13,8 +13,8 @@ repositories {
} }
wpi.maven.useDevelopment = true wpi.maven.useDevelopment = true
wpi.versions.wpilibVersion = "2025.1.1-beta-3" wpi.versions.wpilibVersion = "2025.1.1"
wpi.versions.wpimathVersion = "2025.1.1-beta-3" wpi.versions.wpimathVersion = "2025.1.1"
// Define my targets (RoboRIO) and artifacts (deployable files) // Define my targets (RoboRIO) and artifacts (deployable files)

6
photonlib-java-examples/aimattarget/build.gradle
View File

@@ -1,6 +1,6 @@
plugins { plugins {
id "java" id "java"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" id "edu.wpi.first.GradleRIO" version "2025.1.1"
} }
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
@@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_17
def ROBOT_MAIN_CLASS = "frc.robot.Main" def ROBOT_MAIN_CLASS = "frc.robot.Main"
wpi.maven.useDevelopment = true wpi.maven.useDevelopment = true
wpi.versions.wpilibVersion = "2025.1.1-beta-3" wpi.versions.wpilibVersion = "2025.1.1"
wpi.versions.wpimathVersion = "2025.1.1-beta-3" wpi.versions.wpimathVersion = "2025.1.1"
// Define my targets (RoboRIO) and artifacts (deployable files) // Define my targets (RoboRIO) and artifacts (deployable files)

6
photonlib-java-examples/poseest/build.gradle
View File

@@ -1,6 +1,6 @@
plugins { plugins {
id "java" id "java"
id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" id "edu.wpi.first.GradleRIO" version "2025.1.1"
} }
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
@@ -9,8 +9,8 @@ targetCompatibility = JavaVersion.VERSION_17
def ROBOT_MAIN_CLASS = "frc.robot.Main" def ROBOT_MAIN_CLASS = "frc.robot.Main"
wpi.maven.useDevelopment = true wpi.maven.useDevelopment = true
wpi.versions.wpilibVersion = "2025.1.1-beta-3" wpi.versions.wpilibVersion = "2025.1.1"
wpi.versions.wpimathVersion = "2025.1.1-beta-3" wpi.versions.wpimathVersion = "2025.1.1"
// Define my targets (RoboRIO) and artifacts (deployable files) // Define my targets (RoboRIO) and artifacts (deployable files)