From 9ca273c29acda7321cc2102baed4d06e183d6090 Mon Sep 17 00:00:00 2001 From: Thad House Date: Mon, 24 Jul 2023 20:40:47 -0700 Subject: [PATCH] Update native utils and fix load bugs --- build.gradle | 2 +- src/main/java/com/vendor/jni/VendorJNI.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 06963ac..1726f30 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 '2023.11.1' + id 'edu.wpi.first.NativeUtils' version '2024.0.0' id 'edu.wpi.first.GradleJni' version '1.0.0' id 'edu.wpi.first.GradleVsCode' version '1.3.0' } diff --git a/src/main/java/com/vendor/jni/VendorJNI.java b/src/main/java/com/vendor/jni/VendorJNI.java index 1274b72..db5ba12 100644 --- a/src/main/java/com/vendor/jni/VendorJNI.java +++ b/src/main/java/com/vendor/jni/VendorJNI.java @@ -24,7 +24,7 @@ public class VendorJNI { static { if (Helper.getExtractOnStaticLoad()) { try { - loader = new RuntimeLoader<>("Vendor", RuntimeLoader.getDefaultExtractionRoot(), VendorJNI.class); + loader = new RuntimeLoader<>("VendorDriver", RuntimeLoader.getDefaultExtractionRoot(), VendorJNI.class); loader.loadLibrary(); } catch (IOException ex) { ex.printStackTrace(); @@ -42,7 +42,7 @@ public class VendorJNI { if (libraryLoaded) { return; } - loader = new RuntimeLoader<>("VendorJNI", RuntimeLoader.getDefaultExtractionRoot(), VendorJNI.class); + loader = new RuntimeLoader<>("VendorDriver", RuntimeLoader.getDefaultExtractionRoot(), VendorJNI.class); loader.loadLibrary(); libraryLoaded = true; }