From fea753f5808b284e1d9f8ec32280a7a135a5b72f Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 19 Nov 2023 11:37:49 -0500 Subject: [PATCH] javacan-core-x86_64 was broken during gralde migration? also https://github.com/pschichtel/JavaCAN/issues/48 --- java_console/io/build.gradle | 5 ++++- java_console/{ => io}/lib/JavaCAN-javacan.zip | Bin java_console/{ => io}/lib/javacan-core-x86_64.jar | Bin java_console/{ => io}/lib/javacan-core.jar | Bin 4 files changed, 4 insertions(+), 1 deletion(-) rename java_console/{ => io}/lib/JavaCAN-javacan.zip (100%) rename java_console/{ => io}/lib/javacan-core-x86_64.jar (100%) rename java_console/{ => io}/lib/javacan-core.jar (100%) diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle index 944a9ac7fe..aa9ec2c61c 100644 --- a/java_console/io/build.gradle +++ b/java_console/io/build.gradle @@ -22,7 +22,10 @@ dependencies { api project(':logging') implementation group: 'com.fazecast', name: 'jSerialComm', version: '2.10.3' - implementation group: 'tel.schich', name: 'javacan-core', version: '3.2.0' + // a bit of a mess: javacan-core comes from maven (we keep a file in lib folder just in case) + api group: 'tel.schich', name: 'javacan-core', version: '3.2.0' + // where did this file originally come from?! did someone figure out compile-native.sh arguments or is there a source? + api files('lib/javacan-core-x86_64.jar') implementation global_libs.json implementation ts_plugin_libs.httpclient diff --git a/java_console/lib/JavaCAN-javacan.zip b/java_console/io/lib/JavaCAN-javacan.zip similarity index 100% rename from java_console/lib/JavaCAN-javacan.zip rename to java_console/io/lib/JavaCAN-javacan.zip diff --git a/java_console/lib/javacan-core-x86_64.jar b/java_console/io/lib/javacan-core-x86_64.jar similarity index 100% rename from java_console/lib/javacan-core-x86_64.jar rename to java_console/io/lib/javacan-core-x86_64.jar diff --git a/java_console/lib/javacan-core.jar b/java_console/io/lib/javacan-core.jar similarity index 100% rename from java_console/lib/javacan-core.jar rename to java_console/io/lib/javacan-core.jar