From 5a88fae42ced9d1215f94cec4a16d5c6094fd899 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 29 Aug 2020 07:29:03 -0700 Subject: [PATCH] Update to latest native utils, including wpimath as a dep --- build.gradle | 7 ++++++- config.gradle | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 56d1170..1534286 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 '2020.7.4' + id 'edu.wpi.first.NativeUtils' version '2020.10.1' id 'edu.wpi.first.GradleJni' version '0.11.0' id 'edu.wpi.first.GradleVsCode' version '0.12.0' } @@ -27,7 +27,12 @@ dependencies { implementation 'edu.wpi.first.ntcore:ntcore-java:2020.+' implementation 'edu.wpi.first.wpilibj:wpilibj-java:2020.+' implementation 'edu.wpi.first.wpiutil:wpiutil-java:2020.+' + implementation 'edu.wpi.first.wpimath:wpimath-java:2020.+' implementation 'edu.wpi.first.hal:hal-java:2020.+' + implementation "org.ejml:ejml-simple:0.38" + implementation "com.fasterxml.jackson.core:jackson-annotations:2.10.0" + implementation "com.fasterxml.jackson.core:jackson-core:2.10.0" + implementation "com.fasterxml.jackson.core:jackson-databind:2.10.0" implementation 'edu.wpi.first.thirdparty.frc2020.opencv:opencv-java:3.4.7-3' } diff --git a/config.gradle b/config.gradle index 0cf49f1..0e197bf 100644 --- a/config.gradle +++ b/config.gradle @@ -11,6 +11,7 @@ nativeUtils { opencvVersion = "3.4.7-3" googleTestVersion = "1.9.0-4-437e100-1" imguiVersion = "1.76-2" + wpimathVersion = "2020.+" } } }