From c28665b1ec38303cdaf1f56b482af6fbc2d5322f Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Tue, 17 Oct 2023 18:44:55 -0700 Subject: [PATCH] [wpimath] Upgrade to EJML 0.43.1 --- wpimath/CMakeLists.txt | 30 +++++++++++++++--------------- wpimath/build.gradle | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/wpimath/CMakeLists.txt b/wpimath/CMakeLists.txt index aacfea3742d..93d07f46172 100644 --- a/wpimath/CMakeLists.txt +++ b/wpimath/CMakeLists.txt @@ -19,26 +19,26 @@ if (WITH_JAVA) include(UseJava) set(CMAKE_JAVA_COMPILE_FLAGS "-encoding" "UTF8" "-Xlint:unchecked") - if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpimath/thirdparty/ejml/ejml-simple-0.42.jar") + if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpimath/thirdparty/ejml/ejml-simple-0.43.1.jar") set(BASE_URL "https://search.maven.org/remotecontent?filepath=") set(JAR_ROOT "${WPILIB_BINARY_DIR}/wpimath/thirdparty/ejml") message(STATUS "Downloading EJML jarfiles...") - download_and_check("${BASE_URL}org/ejml/ejml-cdense/0.42/ejml-cdense-0.42.jar" - "${JAR_ROOT}/ejml-cdense-0.42.jar") - download_and_check("${BASE_URL}org/ejml/ejml-core/0.42/ejml-core-0.42.jar" - "${JAR_ROOT}/ejml-core-0.42.jar") - download_and_check("${BASE_URL}org/ejml/ejml-ddense/0.42/ejml-ddense-0.42.jar" - "${JAR_ROOT}/ejml-ddense-0.42.jar") - download_and_check("${BASE_URL}org/ejml/ejml-dsparse/0.42/ejml-dsparse-0.42.jar" - "${JAR_ROOT}/ejml-dsparse-0.42.jar") - download_and_check("${BASE_URL}org/ejml/ejml-fdense/0.42/ejml-fdense-0.42.jar" - "${JAR_ROOT}/ejml-fdense-0.42.jar") - download_and_check("${BASE_URL}org/ejml/ejml-simple/0.42/ejml-simple-0.42.jar" - "${JAR_ROOT}/ejml-simple-0.42.jar") - download_and_check("${BASE_URL}org/ejml/ejml-zdense/0.42/ejml-zdense-0.42.jar" - "${JAR_ROOT}/ejml-zdense-0.42.jar") + download_and_check("${BASE_URL}org/ejml/ejml-cdense/0.43.1/ejml-cdense-0.43.1.jar" + "${JAR_ROOT}/ejml-cdense-0.43.1.jar") + download_and_check("${BASE_URL}org/ejml/ejml-core/0.43.1/ejml-core-0.43.1.jar" + "${JAR_ROOT}/ejml-core-0.43.1.jar") + download_and_check("${BASE_URL}org/ejml/ejml-ddense/0.43.1/ejml-ddense-0.43.1.jar" + "${JAR_ROOT}/ejml-ddense-0.43.1.jar") + download_and_check("${BASE_URL}org/ejml/ejml-dsparse/0.43.1/ejml-dsparse-0.43.1.jar" + "${JAR_ROOT}/ejml-dsparse-0.43.1.jar") + download_and_check("${BASE_URL}org/ejml/ejml-fdense/0.43.1/ejml-fdense-0.43.1.jar" + "${JAR_ROOT}/ejml-fdense-0.43.1.jar") + download_and_check("${BASE_URL}org/ejml/ejml-simple/0.43.1/ejml-simple-0.43.1.jar" + "${JAR_ROOT}/ejml-simple-0.43.1.jar") + download_and_check("${BASE_URL}org/ejml/ejml-zdense/0.43.1/ejml-zdense-0.43.1.jar" + "${JAR_ROOT}/ejml-zdense-0.43.1.jar") message(STATUS "All files downloaded.") endif() diff --git a/wpimath/build.gradle b/wpimath/build.gradle index 0fd755f7241..eaef6144c22 100644 --- a/wpimath/build.gradle +++ b/wpimath/build.gradle @@ -37,7 +37,7 @@ model { } dependencies { - api "org.ejml:ejml-simple:0.42" + api "org.ejml:ejml-simple:0.43.1" api "com.fasterxml.jackson.core:jackson-annotations:2.15.2" api "com.fasterxml.jackson.core:jackson-core:2.15.2" api "com.fasterxml.jackson.core:jackson-databind:2.15.2"