From 7b7dc058c228ad477abad452012ce770c94b3697 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sat, 25 Nov 2023 13:22:24 -0800 Subject: [PATCH] console doesn't have to depend on full config definition! --- java_console/ui/build.gradle | 3 ++- java_tools/configuration_definition_base/build.gradle | 2 ++ .../src/main/java/com/rusefi/trigger/TriggerSignal.java | 0 .../src/main/java/com/rusefi/trigger/TriggerSignalReader.java | 0 .../src/main/java/com/rusefi/trigger/TriggerWheelInfo.java | 0 5 files changed, 4 insertions(+), 1 deletion(-) rename java_tools/{configuration_definition => configuration_definition_base}/src/main/java/com/rusefi/trigger/TriggerSignal.java (100%) rename java_tools/{configuration_definition => configuration_definition_base}/src/main/java/com/rusefi/trigger/TriggerSignalReader.java (100%) rename java_tools/{configuration_definition => configuration_definition_base}/src/main/java/com/rusefi/trigger/TriggerWheelInfo.java (100%) diff --git a/java_console/ui/build.gradle b/java_console/ui/build.gradle index 32adcf3dfe..015417aa30 100644 --- a/java_console/ui/build.gradle +++ b/java_console/ui/build.gradle @@ -11,7 +11,8 @@ configurations { dependencies { implementation project(':ecu_io') implementation project(':luaformatter') - implementation project(':config_definition') + implementation project(':config_definition_base') + implementation project(':logging') implementation 'com.miglayout:miglayout-swing:4.1' implementation files('../lib/dfu/dfu_java.jar') implementation files('../lib/trident-6.2.jar') diff --git a/java_tools/configuration_definition_base/build.gradle b/java_tools/configuration_definition_base/build.gradle index c374699789..2d965a1dd1 100644 --- a/java_tools/configuration_definition_base/build.gradle +++ b/java_tools/configuration_definition_base/build.gradle @@ -9,4 +9,6 @@ dependencies { api project(':enum_to_string') api project(':core_io') + + implementation project(':models') } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerSignal.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerSignal.java similarity index 100% rename from java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerSignal.java rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerSignal.java diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerSignalReader.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerSignalReader.java similarity index 100% rename from java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerSignalReader.java rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerSignalReader.java diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerWheelInfo.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerWheelInfo.java similarity index 100% rename from java_tools/configuration_definition/src/main/java/com/rusefi/trigger/TriggerWheelInfo.java rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/trigger/TriggerWheelInfo.java