From 1eecaaf337f1fc7de41df742021a31af92f849ed Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 1 Dec 2024 06:21:41 +0000 Subject: [PATCH] [build] Update OpenCV to 2025 (#7468) --- shared/config.gradle | 4 ++-- shared/opencv.gradle | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/config.gradle b/shared/config.gradle index 4612e5a3ca4..6e68b00f932 100644 --- a/shared/config.gradle +++ b/shared/config.gradle @@ -13,9 +13,9 @@ nativeUtils.withCrossLinuxArm64() nativeUtils { wpi { configureDependencies { - opencvYear = "frc2024" + opencvYear = "frc2025" niLibVersion = "2025.0.0" - opencvVersion = "4.8.0-4" + opencvVersion = "4.8.0-1" } } } diff --git a/shared/opencv.gradle b/shared/opencv.gradle index dec6793c03b..432a0658f24 100644 --- a/shared/opencv.gradle +++ b/shared/opencv.gradle @@ -1,4 +1,4 @@ -def opencvVersion = '4.8.0-4' +def opencvVersion = '4.8.0-1' if (project.hasProperty('useCpp') && project.useCpp) { model { @@ -22,12 +22,12 @@ if (project.hasProperty('useCpp') && project.useCpp) { if (project.hasProperty('useJava') && project.useJava) { dependencies { - implementation "edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:${opencvVersion}" + implementation "edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:${opencvVersion}" if (!project.hasProperty('skipDev') || !project.skipDev) { - devImplementation "edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:${opencvVersion}" + devImplementation "edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:${opencvVersion}" } if (project.hasProperty('useDocumentation') && project.useDocumentation) { - javaSource "edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:${opencvVersion}:sources" + javaSource "edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:${opencvVersion}:sources" } } }