From ae68ffe4d51ead0558f0386ebf92531568bbda5e Mon Sep 17 00:00:00 2001 From: Matthew Morley Date: Wed, 1 Nov 2023 08:52:13 -0400 Subject: [PATCH] Bump opencv to fix cross-compile rpath --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8f4fe228ba..a869efc46e 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ apply from: "versioningHelper.gradle" ext { wpilibVersion = "2024.1.1-beta-2" - openCVversion = "4.8.0-1" + openCVversion = "4.8.0-2" joglVersion = "2.4.0-rc-20200307" javalinVersion = "5.6.2" frcYear = "2024" @@ -41,6 +41,11 @@ ext { wpilibTools.deps.wpilibVersion = wpilibVersion +// Tell gradlerio what version of things to use (that we care about) +// See: https://github.com/wpilibsuite/GradleRIO/blob/main/src/main/java/edu/wpi/first/gradlerio/wpi/WPIVersionsExtension.java +wpi.getVersions().getOpencvVersion().convention(openCVversion); +wpi.getVersions().getWpilibVersion().convention(wpilibVersion); + spotless { java { target fileTree('.') {