Skip to content

Commit

Permalink
[build] Update OpenCV to 2025 (#7468)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThadHouse authored Dec 1, 2024
1 parent 892e062 commit 1eecaaf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions shared/config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions shared/opencv.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
def opencvVersion = '4.8.0-4'
def opencvVersion = '4.8.0-1'

if (project.hasProperty('useCpp') && project.useCpp) {
model {
Expand All @@ -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"
}
}
}

0 comments on commit 1eecaaf

Please sign in to comment.