From 81076375b8498531bf3e1b1e1ecbdd85df633215 Mon Sep 17 00:00:00 2001 From: Jade Date: Fri, 20 Dec 2024 09:54:48 +0800 Subject: [PATCH] Bump to WPILib beta 3 and OpenCV 4.10 (#1638) Signed-off-by: Jade Turner Co-authored-by: Matt --- build.gradle | 14 +++++++------- .../advanced-installation/sw_install/windows-pc.md | 2 +- photon-server/build.gradle | 2 +- photonlib-cpp-examples/aimandrange/build.gradle | 6 +++--- photonlib-cpp-examples/aimattarget/build.gradle | 6 +++--- photonlib-cpp-examples/poseest/build.gradle | 6 +++--- photonlib-java-examples/aimandrange/build.gradle | 6 +++--- photonlib-java-examples/aimattarget/build.gradle | 6 +++--- photonlib-java-examples/poseest/build.gradle | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 9ef0e5f9a..dcb869c90 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,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.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" 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' @@ -30,16 +30,16 @@ ext.allOutputsFolder = file("$project.buildDir/outputs") apply from: "versioningHelper.gradle" ext { - wpilibVersion = "2025.1.1-beta-2" + wpilibVersion = "2025.1.1-beta-3" wpimathVersion = wpilibVersion - openCVYear = "2024" - openCVversion = "4.8.0-4" + openCVYear = "2025" + openCVversion = "4.10.0-3" joglVersion = "2.4.0" javalinVersion = "5.6.2" - libcameraDriverVersion = "dev-v2023.1.0-15-gc8988b3" - rknnVersion = "dev-v2024.0.1-4-g0db16ac" + libcameraDriverVersion = "v2025.0.0" + rknnVersion = "v2025.0.0" frcYear = "2025" - mrcalVersion = "dev-v2024.0.0-27-g41d7868"; + mrcalVersion = "v2025.0.0"; pubVersion = versionString 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 d152cef33..12122b8ee 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.1.1-beta-2) 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-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`: ``` > ./gradlew run "-Dorg.gradle.java.home=C:\Users\Public\wpilib\2025\jdk" diff --git a/photon-server/build.gradle b/photon-server/build.gradle index fb140545f..5a0e09cc2 100644 --- a/photon-server/build.gradle +++ b/photon-server/build.gradle @@ -1,6 +1,6 @@ plugins { id "application" - id 'com.github.johnrengelman.shadow' version '8.1.1' + id 'com.gradleup.shadow' version '8.3.4' id "com.github.node-gradle.node" version "7.0.1" id "org.hidetake.ssh" version "2.11.2" id 'edu.wpi.first.WpilibTools' version '1.3.0' diff --git a/photonlib-cpp-examples/aimandrange/build.gradle b/photonlib-cpp-examples/aimandrange/build.gradle index 8e64f1262..893adb42c 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.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } repositories { @@ -11,8 +11,8 @@ repositories { wpi.maven.useLocal = false wpi.maven.useDevelopment = false -wpi.versions.wpilibVersion = "2025.1.1-beta-2" -wpi.versions.wpimathVersion = "2025.1.1-beta-2" +wpi.versions.wpilibVersion = "2025.1.1-beta-3" +wpi.versions.wpimathVersion = "2025.1.1-beta-3" // 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 8e64f1262..893adb42c 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.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } repositories { @@ -11,8 +11,8 @@ repositories { wpi.maven.useLocal = false wpi.maven.useDevelopment = false -wpi.versions.wpilibVersion = "2025.1.1-beta-2" -wpi.versions.wpimathVersion = "2025.1.1-beta-2" +wpi.versions.wpilibVersion = "2025.1.1-beta-3" +wpi.versions.wpimathVersion = "2025.1.1-beta-3" // 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 8e64f1262..893adb42c 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.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } repositories { @@ -11,8 +11,8 @@ repositories { wpi.maven.useLocal = false wpi.maven.useDevelopment = false -wpi.versions.wpilibVersion = "2025.1.1-beta-2" -wpi.versions.wpimathVersion = "2025.1.1-beta-2" +wpi.versions.wpilibVersion = "2025.1.1-beta-3" +wpi.versions.wpimathVersion = "2025.1.1-beta-3" // 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 9cf6b077c..91d0772d4 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.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } sourceCompatibility = JavaVersion.VERSION_17 @@ -13,8 +13,8 @@ repositories { } wpi.maven.useDevelopment = true -wpi.versions.wpilibVersion = "2025.1.1-beta-2" -wpi.versions.wpimathVersion = "2025.1.1-beta-2" +wpi.versions.wpilibVersion = "2025.1.1-beta-3" +wpi.versions.wpimathVersion = "2025.1.1-beta-3" // 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 87b6f168c..b91bde8b8 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.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } 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.1.1-beta-2" -wpi.versions.wpimathVersion = "2025.1.1-beta-2" +wpi.versions.wpilibVersion = "2025.1.1-beta-3" +wpi.versions.wpimathVersion = "2025.1.1-beta-3" // 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 6b6e18443..62c626d7c 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.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } 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.1.1-beta-2" -wpi.versions.wpimathVersion = "2025.1.1-beta-2" +wpi.versions.wpilibVersion = "2025.1.1-beta-3" +wpi.versions.wpimathVersion = "2025.1.1-beta-3" // Define my targets (RoboRIO) and artifacts (deployable files)