From f32ede7b1f87947c4a5dceb1fc5ca27f6b13e428 Mon Sep 17 00:00:00 2001 From: Thad House Date: Mon, 11 Sep 2023 09:52:41 -0700 Subject: [PATCH] Fix deps --- build.gradle | 18 +++++++++--------- config.gradle | 16 +++++++++------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index bebf851..6a1a394 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'java' id 'google-test' id 'edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin' version '2020.2' - id 'edu.wpi.first.NativeUtils' version '2024.0.0' + id 'edu.wpi.first.NativeUtils' version '2024.2.0' id 'edu.wpi.first.GradleJni' version '1.0.0' id 'edu.wpi.first.GradleVsCode' version '1.3.0' } @@ -22,14 +22,14 @@ apply from: 'config.gradle' // Apply Java configuration dependencies { - implementation 'edu.wpi.first.cscore:cscore-java:2023.+' - implementation 'edu.wpi.first.cameraserver:cameraserver-java:2023.+' - implementation 'edu.wpi.first.ntcore:ntcore-java:2023.+' - implementation 'edu.wpi.first.wpilibj:wpilibj-java:2023.+' - implementation 'edu.wpi.first.wpiutil:wpiutil-java:2023.+' - implementation 'edu.wpi.first.wpimath:wpimath-java:2023.+' - implementation 'edu.wpi.first.wpiunits:wpiunits-java:2023.+' - implementation 'edu.wpi.first.hal:hal-java:2023.+' + implementation 'edu.wpi.first.cscore:cscore-java:2024.+' + implementation 'edu.wpi.first.cameraserver:cameraserver-java:2024.+' + implementation 'edu.wpi.first.ntcore:ntcore-java:2024.+' + implementation 'edu.wpi.first.wpilibj:wpilibj-java:2024.+' + implementation 'edu.wpi.first.wpiutil:wpiutil-java:2024.+' + implementation 'edu.wpi.first.wpimath:wpimath-java:2024.+' + implementation 'edu.wpi.first.wpiunits:wpiunits-java:2024.+' + implementation 'edu.wpi.first.hal:hal-java:2024.+' implementation "org.ejml:ejml-simple:0.41" implementation "com.fasterxml.jackson.core:jackson-annotations:2.12.4" implementation "com.fasterxml.jackson.core:jackson-core:2.12.4" diff --git a/config.gradle b/config.gradle index 20fb7ab..26d2ead 100644 --- a/config.gradle +++ b/config.gradle @@ -4,14 +4,16 @@ nativeUtils.addWpiNativeUtils() nativeUtils.withCrossRoboRIO() nativeUtils { - wpi { - configureDependencies { - wpiVersion = "2023.+" - niLibVersion = "2023.3.0" - opencvVersion = "4.6.0-3" - googleTestVersion = "1.12.1-1" + wpi { + configureDependencies { + wpiVersion = "2024.+" + opencvYear = "frc2023" + googleTestYear = "frc2023" + niLibVersion = "2023.3.0" + opencvVersion = "4.6.0-5" + googleTestVersion = "1.12.1-2" + } } - } } nativeUtils.wpi.addWarnings()