From 4b497f9eb7568c680903419ff903ad152df9de78 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sat, 15 Oct 2022 11:12:18 -0400
Subject: [PATCH] let's separate Android from not Android

---
 java_tools/.idea/gradle.xml            | 16 +++++++++++++
 java_tools/enum_to_string/build.gradle |  8 +++----
 java_tools/settings.gradle             | 31 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/java_tools/.idea/gradle.xml b/java_tools/.idea/gradle.xml
index a1cca83d6d..b6c7034b71 100644
--- a/java_tools/.idea/gradle.xml
+++ b/java_tools/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -8,8 +9,23 @@
         <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
+            <option value="$PROJECT_DIR$/../java_console/autoupdate" />
+            <option value="$PROJECT_DIR$/../java_console/inifile" />
+            <option value="$PROJECT_DIR$/../java_console/io" />
+            <option value="$PROJECT_DIR$/../java_console/logging" />
             <option value="$PROJECT_DIR$/../java_console/logging-api" />
+            <option value="$PROJECT_DIR$/../java_console/models" />
+            <option value="$PROJECT_DIR$/../java_console/shared_io" />
+            <option value="$PROJECT_DIR$/../java_console/shared_ui" />
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/bin2header" />
+            <option value="$PROJECT_DIR$/configuration_definition" />
+            <option value="$PROJECT_DIR$/enum_to_string" />
+            <option value="$PROJECT_DIR$/gcc_map_reader" />
+            <option value="$PROJECT_DIR$/logicdata2c" />
+            <option value="$PROJECT_DIR$/ts_plugin" />
+            <option value="$PROJECT_DIR$/ts_plugin_launcher" />
+            <option value="$PROJECT_DIR$/version2header" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/java_tools/enum_to_string/build.gradle b/java_tools/enum_to_string/build.gradle
index 671064ef67..8301278d00 100644
--- a/java_tools/enum_to_string/build.gradle
+++ b/java_tools/enum_to_string/build.gradle
@@ -41,11 +41,11 @@ shadowJar {
 
     /*
      to keep only classes from logging
-     and loggin-api as in build.xml
+     and logging-api as in build.xml
     */
     dependencies {
-        exclude(dependency(libs.jsr305))
-        exclude(dependency(libs.junit))
-        exclude(dependency(libs.annotations))
+        exclude(dependency(global_libs.jsr305))
+        exclude(dependency(global_libs.junit))
+        exclude(dependency(global_libs.annotations))
     }
 }
\ No newline at end of file
diff --git a/java_tools/settings.gradle b/java_tools/settings.gradle
index 6e7f84c633..9d5bfa557a 100644
--- a/java_tools/settings.gradle
+++ b/java_tools/settings.gradle
@@ -2,3 +2,34 @@ include ':logging-api'
 project(':logging-api').projectDir = new File('../java_console/logging-api')
 include ':gcc_map_reader'
 project(':gcc_map_reader').projectDir = new File('gcc_map_reader')
+include ':enum_to_string'
+project(':enum_to_string').projectDir = new File('enum_to_string')
+include ':logicdata2c'
+project(':logicdata2c').projectDir = new File('logicdata2c')
+include ':version2header'
+project(':version2header').projectDir = new File('version2header')
+include ':bin2header'
+project(':bin2header').projectDir = new File('bin2header')
+include ':config_definition'
+project(':config_definition').projectDir = new File('configuration_definition')
+include ':ts_plugin_launcher'
+project(':ts_plugin_launcher').projectDir = new File('ts_plugin_launcher')
+include ':ts_plugin'
+project(':ts_plugin').projectDir = new File('ts_plugin')
+include ':autoupdate'
+project(':autoupdate').projectDir = new File('../java_console/autoupdate')
+include ':shared_io'
+project(':shared_io').projectDir = new File('../java_console/shared_io')
+include ':shared_ui'
+project(':shared_ui').projectDir = new File('../java_console/shared_ui')
+include ':ecu_io'
+project(':ecu_io').projectDir = new File('../java_console/io')
+include ':logging'
+project(':logging').projectDir = new File('../java_console/logging')
+include ':logging-api'
+project(':logging-api').projectDir = new File('../java_console/logging-api')
+include ':inifile'
+project(':inifile').projectDir = new File('../java_console/inifile')
+include ':models'
+project(':models').projectDir = new File('../java_console/models')
+