REO progress

java_console/autoupdate/autoupdate.iml

@@ -3,7 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

java_console/autoupdate/build.gradle

@@ -0,0 +1,27 @@
+plugins {
+    id 'java'
+}
+
+apply from: '../../android/dependencies.gradle'
+
+configurations {
+    all*.exclude group: 'org.hamcrest', module: 'hamcrest-core'
+}
+
+dependencies {
+    implementation libs.javaxJson
+    implementation project(':inifile')
+    implementation project(':models')
+    implementation project(':logging-api')
+    implementation project(':shared_io')
+
+    implementation libs.annotations
+    implementation group: 'com.fazecast', name: 'jSerialComm', version: '2.6.2'
+    implementation group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
+    implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
+    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12'
+
+    // junit 4.13 does not mix well with httpclient :(
+    testImplementation group: 'junit', name: 'junit', version: '4.8.2'
+    testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
+}

java_console/autoupdate/src/main/java/com/rusefi/autoupdate/Autoupdate.java

@@ -2,6 +2,7 @@ package com.rusefi.autoupdate;
 
 import com.rusefi.shared.ConnectionAndMeta;
 import com.rusefi.shared.FileUtil;
+import com.rusefi.ui.storage.PersistentConfiguration;
 import com.rusefi.ui.util.FrameHelper;
 
 import javax.swing.*;
@@ -17,8 +18,6 @@ import java.util.Date;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
-
 public class Autoupdate {
     private static final String TITLE = "rusEFI Bundle Updater 20200607";
     private static final String BUNDLE_NAME_FILE = "../bundle_name.txt";
@@ -56,7 +55,7 @@ public class Autoupdate {
     }
 
     private static UpdateMode getMode() {
-        String value = getConfig().getRoot().getProperty(AUTOUPDATE_MODE);
+        String value = PersistentConfiguration.getConfig().getRoot().getProperty(AUTOUPDATE_MODE);
         try {
             return UpdateMode.valueOf(value);
         } catch (Throwable e) {
@@ -131,7 +130,7 @@ public class Autoupdate {
         never.addActionListener(new AbstractAction() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                getConfig().getRoot().setProperty(AUTOUPDATE_MODE, UpdateMode.NEVER.toString());
+                PersistentConfiguration.getConfig().getRoot().setProperty(AUTOUPDATE_MODE, UpdateMode.NEVER.toString());
                 frameHelper.getFrame().dispose();
             }
         });
@@ -162,7 +161,7 @@ public class Autoupdate {
         always.addActionListener(new AbstractAction() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                getConfig().getRoot().setProperty(AUTOUPDATE_MODE, UpdateMode.ALWAYS.toString());
+                PersistentConfiguration.getConfig().getRoot().setProperty(AUTOUPDATE_MODE, UpdateMode.ALWAYS.toString());
                 doUpdate.set(true);
                 frameHelper.getFrame().dispose();
             }

java_console/build.xml

@@ -43,7 +43,7 @@
         <javac debug="yes" destdir="build/classes"
                classpath="${lib_list}">
             <src path="autotest/src"/>
-            <src path="autoupdate/src"/>
+            <src path="autoupdate/src/main/java"/>
             <src path="../java_tools/configuration_definition/src"/>
             <src path="../java_tools/enum_to_string/src"/>
             <src path="../java_tools/proxy_server/src/main/java"/>

java_tools/ts_plugin/build.xml

@@ -16,7 +16,7 @@
                classpath="${console_path}/lib/log4j-api-2.13.3.jar:${console_path}/lib/log4j-core-2.13.3.jar:${console_path}/lib/jsr305-2.0.1.jar:${console_path}/lib/jcip-annotations-1.0.jar:${console_path}/lib/annotations.jar:${console_path}/lib/jSerialComm.jar:${console_path}/lib/junit.jar:${console_path}/lib/json-simple-1.1.1.jar:${console_path}/lib/annotations.jar:${launcher_path}/lib/TunerStudioPluginAPI.jar:${console_path}/lib/httpclient.jar:${console_path}/lib/httpmime.jar:${console_path}/lib/httpcore.jar"
         >
             <src path="${console_path}/shared_ui/src"/>
-            <src path="${console_path}/autoupdate/src"/>
+            <src path="${console_path}/autoupdate/src/main/java"/>
             <src path="${console_path}/shared_io/src/main/java"/>
             <src path="${console_path}/inifile/src"/>
             <src path="${console_path}/logging/src"/>