From ce3dc70c892416a047bcb63c6f3559c4921d011b Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Tue, 1 Nov 2022 10:45:07 -0400
Subject: [PATCH] Let's admit it it's time to move to gradle #3014

autoupdate fix
---
 java_console/.gitignore              |  3 ---
 java_console/autoupdate/build.gradle | 16 ++++++++++++----
 misc/jenkins/build_working_folder.sh |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/java_console/.gitignore b/java_console/.gitignore
index d27c068ccf..e734e72ddf 100644
--- a/java_console/.gitignore
+++ b/java_console/.gitignore
@@ -1,6 +1,4 @@
 build_hw
-autoupdate_build
-rusefi_autoupdate.jar
 logs/
 rusefi_console_properties.xml
 generated*.cpp
@@ -8,7 +6,6 @@ currenttune.msq
 output.msq
 rusefi.ini
 openocd
-DfuSe
 rusefi_*.*
 triggers
 unit_test*.xml
diff --git a/java_console/autoupdate/build.gradle b/java_console/autoupdate/build.gradle
index a834342cbe..bd7b77f8d1 100644
--- a/java_console/autoupdate/build.gradle
+++ b/java_console/autoupdate/build.gradle
@@ -1,12 +1,9 @@
 plugins {
     id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '6.1.0'
 }
 
 apply from: '../../java_tools/dependencies.gradle'
 
-defaultTasks 'shadowJar'
-
 configurations {
     all*.exclude group: 'org.hamcrest', module: 'hamcrest-core'
 }
@@ -27,7 +24,18 @@ dependencies {
     testImplementation global_libs.mockito
 }
 
-shadowJar {
+// yes nasty sorry
+evaluationDependsOn(':core_ui')
+evaluationDependsOn(':core_io')
+
+jar {
+    archivesBaseName = 'rusefi_autoupdate'
+    destinationDir = file("$rootDir/../java_console_binary")
+
+    from project.sourceSets.main.allSource
+    from project(':core_ui').sourceSets.main.output
+    from project(":core_io").sourceSets.main.output
+
     manifest {
         attributes(
                 'Main-Class': 'com.rusefi.autoupdate.Autoupdate'
diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh
index 5b8d81398e..8ba421f193 100755
--- a/misc/jenkins/build_working_folder.sh
+++ b/misc/jenkins/build_working_folder.sh
@@ -52,7 +52,7 @@ else
   cp $RUSEFI_CONSOLE_SETTINGS $CONSOLE_FOLDER
 fi
 
-cp java_console/rusefi_autoupdate.jar     $CONSOLE_FOLDER
+cp java_console_binary/rusefi_autoupdate.jar $CONSOLE_FOLDER
 cp java_console_binary/rusefi_console.jar $CONSOLE_FOLDER
 cp java_tools/ts_plugin_launcher/build/jar/rusefi_ts_plugin_launcher.jar $FOLDER
 cp simulator/build/rusefi_simulator.exe   $CONSOLE_FOLDER