diff --git a/android/app/build.gradle b/android/app/build.gradle index 0fad76f732..0f65069e04 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -49,7 +49,6 @@ android { dependencies { implementation project(':ecu_io') - implementation project(':autoupdate') implementation project(':logging-api') implementation project(':shared_io') implementation project(':models') diff --git a/android/settings.gradle b/android/settings.gradle index 7299c0bb3d..d3528707ba 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -13,21 +13,3 @@ include ':inifile' project(':inifile').projectDir = new File('../java_console/inifile') include ':models' project(':models').projectDir = new File('../java_console/models') -include ':autoupdate' -project(':autoupdate').projectDir = new File('../java_console/autoupdate') -include ':gcc_map_reader' -project(':gcc_map_reader').projectDir = new File('../java_tools/gcc_map_reader') -include ':logicdata2c' -project(':logicdata2c').projectDir = new File('../java_tools/logicdata2c') -include ':version2header' -project(':version2header').projectDir = new File('../java_tools/version2header') -include ':enum_to_string' -project(':enum_to_string').projectDir = new File('../java_tools/enum_to_string') -include ':bin2header' -project(':bin2header').projectDir = new File('../java_tools/bin2header') -include ':config_definition' -project(':config_definition').projectDir = new File('../java_tools/configuration_definition') -include ':ts_plugin_launcher' -project(':ts_plugin_launcher').projectDir = new File('../java_tools/ts_plugin_launcher') -include ':ts_plugin' -project(':ts_plugin').projectDir = new File('../java_tools/ts_plugin') diff --git a/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java b/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java index a9f7e7a77b..547765808c 100644 --- a/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java +++ b/java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java @@ -2,10 +2,8 @@ package com.rusefi.autoupdate; import com.rusefi.shared.ConnectionAndMeta; import com.rusefi.shared.FileUtil; -import com.rusefi.ui.storage.PersistentConfiguration; +import com.rusefi.preferences.storage.PersistentConfiguration; import com.rusefi.ui.util.FrameHelper; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -22,13 +20,12 @@ import java.util.concurrent.atomic.AtomicBoolean; public class Autoupdate { private static final String TITLE = "rusEFI Bundle Updater 20220717"; - private static final String BUNDLE_NAME_FILE = "../bundle_name.txt"; private static final String AUTOUPDATE_MODE = "autoupdate"; private static final String RUSEFI_CONSOLE_JAR = "rusefi_console.jar"; private static final String COM_RUSEFI_LAUNCHER = "com.rusefi.Launcher"; public static void main(String[] args) { - String bundleFullName = readBundleFullName(); + String bundleFullName = BundleUtil.readBundleFullName(); if (args.length > 0 && args[0].equalsIgnoreCase("release")) { System.out.println("Release update requested"); @@ -198,31 +195,6 @@ public class Autoupdate { return doUpdate.get(); } - /** - * @return null in case of error - */ - @Nullable - public static String readBundleFullName() { - try { - BufferedReader r = new BufferedReader(new FileReader(BUNDLE_NAME_FILE)); - String fullName = r.readLine(); - fullName = fullName.trim(); - if (fullName.length() < 3) - return null; // just paranoia check - return fullName; - } catch (IOException e) { - System.err.println(new Date() + ": Error reading " + BUNDLE_NAME_FILE); - return null; - } - } - - @NotNull - public static String readBundleFullNameNotNull() { - String bundle = readBundleFullName(); - bundle = bundle == null ? "unknown bundle" : bundle; - return bundle; - } - enum UpdateMode { ALWAYS, NEVER, diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle index fab9d452ed..583baf5844 100644 --- a/java_console/io/build.gradle +++ b/java_console/io/build.gradle @@ -15,7 +15,6 @@ tasks.withType(Test) { dependencies { implementation libs.javaxJson - api project(':autoupdate') api project(':models') api project(':shared_io') api project(':logging') diff --git a/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java b/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java index 3c91948c1e..333af63323 100644 --- a/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java +++ b/java_console/io/src/main/java/com/rusefi/io/DfuHelper.java @@ -3,7 +3,7 @@ package com.rusefi.io; import com.devexperts.logging.Logging; import com.rusefi.RusEfiSignature; import com.rusefi.SignatureHelper; -import com.rusefi.autoupdate.Autoupdate; +import com.rusefi.autoupdate.BundleUtil; import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.config.generated.Fields; import com.rusefi.ui.StatusConsumer; @@ -32,7 +32,7 @@ public class DfuHelper { public static boolean sendDfuRebootCommand(JComponent parent, String signature, IoStream stream, StatusConsumer messages) { RusEfiSignature s = SignatureHelper.parse(signature); - String bundleName = Autoupdate.readBundleFullName(); + String bundleName = BundleUtil.readBundleFullName(); if (bundleName != null && s != null) { String signatureWithPrefix; if ("all".equals(s.getBundle())) { diff --git a/java_console/io/src/main/java/com/rusefi/tools/VehicleToken.java b/java_console/io/src/main/java/com/rusefi/tools/VehicleToken.java index cffaef4a35..5eaa669070 100644 --- a/java_console/io/src/main/java/com/rusefi/tools/VehicleToken.java +++ b/java_console/io/src/main/java/com/rusefi/tools/VehicleToken.java @@ -1,10 +1,10 @@ package com.rusefi.tools; import com.rusefi.server.SessionDetails; -import com.rusefi.ui.storage.Node; +import com.rusefi.preferences.storage.Node; import org.jetbrains.annotations.NotNull; -import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; +import static com.rusefi.preferences.storage.PersistentConfiguration.getConfig; public class VehicleToken { private static final String VEHICLE_TOKEN = "VEHICLE_TOKEN"; diff --git a/java_console/models/build.gradle b/java_console/models/build.gradle index 438216c43b..fd7862c25b 100644 --- a/java_console/models/build.gradle +++ b/java_console/models/build.gradle @@ -5,7 +5,6 @@ plugins { apply from: '../../android/dependencies.gradle' dependencies { - api project(':autoupdate') api project(':inifile') api libs.snakeyaml } \ No newline at end of file diff --git a/java_console/shared_io/src/main/java/com/rusefi/autoupdate/BundleUtil.java b/java_console/shared_io/src/main/java/com/rusefi/autoupdate/BundleUtil.java new file mode 100644 index 0000000000..8d91b6d248 --- /dev/null +++ b/java_console/shared_io/src/main/java/com/rusefi/autoupdate/BundleUtil.java @@ -0,0 +1,38 @@ +package com.rusefi.autoupdate; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.Date; + +public class BundleUtil { + private static final String BUNDLE_NAME_FILE = "../bundle_name.txt"; + + /** + * @return null in case of error + */ + @Nullable + public static String readBundleFullName() { + try { + BufferedReader r = new BufferedReader(new FileReader(BUNDLE_NAME_FILE)); + String fullName = r.readLine(); + fullName = fullName.trim(); + if (fullName.length() < 3) + return null; // just paranoia check + return fullName; + } catch (IOException e) { + System.err.println(new Date() + ": Error reading " + BUNDLE_NAME_FILE); + return null; + } + } + + @NotNull + public static String readBundleFullNameNotNull() { + String bundle = readBundleFullName(); + bundle = bundle == null ? "unknown bundle" : bundle; + return bundle; + } +} diff --git a/java_console/autoupdate/src/main/java/com/rusefi/ui/storage/Node.java b/java_console/shared_io/src/main/java/com/rusefi/preferences/storage/Node.java similarity index 98% rename from java_console/autoupdate/src/main/java/com/rusefi/ui/storage/Node.java rename to java_console/shared_io/src/main/java/com/rusefi/preferences/storage/Node.java index ad1e8a7dbb..3e14f0254b 100644 --- a/java_console/autoupdate/src/main/java/com/rusefi/ui/storage/Node.java +++ b/java_console/shared_io/src/main/java/com/rusefi/preferences/storage/Node.java @@ -1,4 +1,4 @@ -package com.rusefi.ui.storage; +package com.rusefi.preferences.storage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java_console/autoupdate/src/main/java/com/rusefi/ui/storage/PersistentConfiguration.java b/java_console/shared_io/src/main/java/com/rusefi/preferences/storage/PersistentConfiguration.java similarity index 98% rename from java_console/autoupdate/src/main/java/com/rusefi/ui/storage/PersistentConfiguration.java rename to java_console/shared_io/src/main/java/com/rusefi/preferences/storage/PersistentConfiguration.java index dc4a4adb50..770b6a2c69 100644 --- a/java_console/autoupdate/src/main/java/com/rusefi/ui/storage/PersistentConfiguration.java +++ b/java_console/shared_io/src/main/java/com/rusefi/preferences/storage/PersistentConfiguration.java @@ -1,4 +1,4 @@ -package com.rusefi.ui.storage; +package com.rusefi.preferences.storage; import com.rusefi.shared.FileUtil; diff --git a/java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java b/java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java index 4941bb1791..87984c16c0 100644 --- a/java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java +++ b/java_console/shared_ui/src/main/java/com/rusefi/ui/AuthTokenPanel.java @@ -2,7 +2,7 @@ package com.rusefi.ui; import com.devexperts.logging.Logging; import com.rusefi.auth.AuthTokenUtil; -import com.rusefi.ui.storage.PersistentConfiguration; +import com.rusefi.preferences.storage.PersistentConfiguration; import com.rusefi.ui.util.URLLabel; import org.jetbrains.annotations.NotNull; @@ -14,7 +14,7 @@ import java.awt.datatransfer.*; import java.awt.event.ActionEvent; import java.io.IOException; -import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; +import static com.rusefi.preferences.storage.PersistentConfiguration.getConfig; public class AuthTokenPanel { private final static Logging log = Logging.getLogging(AuthTokenPanel.class); diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java index 68beebc013..7f09eed06c 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java @@ -37,7 +37,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicReference; -import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; +import static com.rusefi.preferences.storage.PersistentConfiguration.getConfig; /** * remote ECU access & control diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadView.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadView.java index 90dcd957c4..bdc8e951f9 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadView.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/UploadView.java @@ -1,7 +1,7 @@ package com.rusefi.ts_plugin; import com.rusefi.tools.online.UploadResult; -import com.rusefi.ui.storage.PersistentConfiguration; +import com.rusefi.preferences.storage.PersistentConfiguration; import org.putgemin.VerticalFlowLayout; import javax.swing.*;