diff --git a/build.gradle b/build.gradle index d01804d0d..76d4586c7 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,7 @@ ext { wpilibVersion = "2024.3.2" wpimathVersion = wpilibVersion openCVversion = "4.8.0-5" + photonlib_openCVversion = "4.8.0-4" joglVersion = "2.4.0" javalinVersion = "5.6.2" libcameraDriverVersion = "dev-v2023.1.0-14-g787ab59" diff --git a/photon-lib/build.gradle b/photon-lib/build.gradle index d42ad8730..93749c124 100644 --- a/photon-lib/build.gradle +++ b/photon-lib/build.gradle @@ -16,6 +16,12 @@ apply plugin: 'google-test-test-suite' apply plugin: 'edu.wpi.first.NativeUtils' apply from: "${rootDir}/shared/config.gradle" +// reset the opencv version again lol +nativeUtils.wpi.configureDependencies { + opencvVersion = photonlib_openCVversion +} +wpi.getVersions().getOpencvVersion().convention(photonlib_openCVversion); + apply from: "${rootDir}/shared/javacommon.gradle" apply from: "${rootDir}/versioningHelper.gradle" @@ -338,4 +344,4 @@ nativeConfig.dependencies.add wpilibTools.deps.wpilib("ntcore") nativeConfig.dependencies.add wpilibTools.deps.wpilib("cscore") nativeConfig.dependencies.add wpilibTools.deps.wpilib("apriltag") nativeConfig.dependencies.add wpilibTools.deps.wpilib("hal") -nativeConfig.dependencies.add photonOpenCv("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get()) +nativeConfig.dependencies.add wpilibTools.deps.wpilibOpenCv("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get()) diff --git a/shared/javacommon.gradle b/shared/javacommon.gradle index 9c0bb099c..cbd2895c9 100644 --- a/shared/javacommon.gradle +++ b/shared/javacommon.gradle @@ -121,7 +121,12 @@ dependencies { implementation wpilibTools.deps.wpilibJava("wpilibj") implementation wpilibTools.deps.wpilibJava("apriltag") implementation wpilibTools.deps.wpilibJava("wpiunits") - implementation photonOpenCvJava("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get()) + if (project.name == "photon-lib") { + println "Depending on wpilib opencv version " + wpi.versions.opencvVersion.get() + implementation wpilibTools.deps.wpilibOpenCvJava("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get()) + } else { + implementation photonOpenCvJava("frc" + wpi.frcYear.get(), wpi.versions.opencvVersion.get()) + } implementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: wpi.versions.jacksonVersion.get() implementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: wpi.versions.jacksonVersion.get()