Skip to content

Commit

Permalink
Bump opencv to 2025
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterJohnson committed Dec 16, 2024
1 parent 967985d commit 4562490
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public WPIJavaDepsExtension(WPIVersionsExtension versions, ProviderFactory provi
createJavaDependencies("edu.wpi.first.wpiunits", "wpiunits-java", versions.getWpilibVersion());
createJavaDependencies("edu.wpi.first.epilogue", "epilogue-runtime-java", versions.getWpilibVersion());

createJavaDependencies("edu.wpi.first.thirdparty.frc2024.opencv", "opencv-java", versions.getOpencvVersion());
createJavaDependencies("edu.wpi.first.thirdparty.frc2025.opencv", "opencv-java", versions.getOpencvVersion());
createJavaDependencies("org.ejml", "ejml-simple", versions.getEjmlVersion());

createJavaDependencies("com.fasterxml.jackson.core", "jackson-annotations", versions.getJacksonVersion());
Expand Down Expand Up @@ -98,7 +98,7 @@ private List<Provider<String>> getWpilibJniInternal(boolean debug, String platfo
createJniDependency("edu.wpi.first.wpimath", "wpimath-cpp", versions.getWpimathVersion(), debug, platform),
createJniDependency("edu.wpi.first.ntcore", "ntcore-cpp", versions.getWpilibVersion(), debug, platform),
createJniDependency("edu.wpi.first.cscore", "cscore-cpp", versions.getWpilibVersion(), debug, platform),
createJniDependency("edu.wpi.first.thirdparty.frc2024.opencv", "opencv-cpp", versions.getOpencvVersion(), debug, platform),
createJniDependency("edu.wpi.first.thirdparty.frc2025.opencv", "opencv-cpp", versions.getOpencvVersion(), debug, platform),
createJniDependency("edu.wpi.first.wpinet", "wpinet-cpp", versions.getWpilibVersion(), debug, platform),
createJniDependency("edu.wpi.first.wpiutil", "wpiutil-cpp", versions.getWpilibVersion(), debug, platform),
createJniDependency("edu.wpi.first.apriltag", "apriltag-cpp", versions.getWpilibVersion(), debug, platform)
Expand Down
2 changes: 1 addition & 1 deletion versionupdates.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def versionMap = [
sysIdVersion: 'edu.wpi.first.tools:SysId:+:windowsx86-64@zip',
roboRIOTeamNumberSetterVersion: 'edu.wpi.first.tools:roboRIOTeamNumberSetter:+:windowsx86-64@zip',
dataLogToolVersion: 'edu.wpi.first.tools:DataLogTool:+:windowsx86-64@zip',
opencvVersion: 'edu.wpi.first.thirdparty.frc2024.opencv:opencv-java:+',
opencvVersion: 'edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:+',
niLibrariesVersion: 'edu.wpi.first.ni-libraries:runtime:+:allowedimages@zip',
imguiVersion: 'edu.wpi.first.thirdparty.frc2024:imgui:+:headers',
wpimathVersion: 'edu.wpi.first.wpimath:wpimath-java:+'
Expand Down

0 comments on commit 4562490

Please sign in to comment.