let's separate Android from not Android

android/app/build.gradle

@@ -37,9 +37,9 @@ android {
     }
 
     buildTypes {
-	debug {
+        debug {
-	    minifyEnabled false
+            minifyEnabled false
-	}
+        }
         release {
             minifyEnabled false
             signingConfig signingConfigs.release
@@ -51,7 +51,6 @@ dependencies {
     implementation project(':ecu_io')
     implementation project(':logging-api')
     implementation project(':models')
-    implementation libs.annotations
 
     def acraVersion = '5.7.0'
     implementation "ch.acra:acra-http:$acraVersion"
@@ -72,8 +71,6 @@ dependencies {
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
-    testImplementation libs.junit
 }
 
 /*

android/build.gradle

@@ -9,6 +9,7 @@ buildscript {
 }
 
 apply from: 'dependencies.gradle'
+apply from: '../java_tools/dependencies.gradle'
 
 allprojects {
     repositories {
@@ -19,8 +20,8 @@ allprojects {
 
     plugins.withType(JavaPlugin) {
         dependencies {
-            implementation libs.annotations
+            implementation global_libs.annotations
-            testImplementation libs.junit
+            testImplementation global_libs.junit
         }
     }
 }

android/dependencies.gradle

@@ -1,19 +1,8 @@
 ext {
   libs = [
-          junit          : "junit:junit:4.13",
           mockito        : "org.mockito:mockito-all:1.10.19",
-          annotations    : "org.jetbrains:annotations:16.0.1",
           javaxJson      : "javax.json:javax.json-api:1.1.4",
           snakeyaml      : "org.yaml:snakeyaml:1.26",
-          jsr305         : "com.google.code.findbugs:jsr305:3.0.2",
           commons_logging: "commons-logging:commons-logging:1.2",
-          json           : "com.googlecode.json-simple:json-simple:1.1.1",
-  ]
-
-  ts_plugin_libs = [
-          httpclient  : "org.apache.httpcomponents:httpclient:4.5.12",
-          httpcore    : "org.apache.httpcomponents:httpcore:4.4.13",
-          httpmime    : "org.apache.httpcomponents:httpmime:4.5.12",
-          launcher_api: fileTree( dir: "lib", include: "TunerStudioPluginAPI.jar" )
   ]
 }

java_console/autotests/autotests.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

java_console/autoupdate/build.gradle

@@ -15,7 +15,7 @@ dependencies {
     api project(':core_io')
 
     api group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
-    api libs.json
+    api global_libs.json
     // not 'api' since Android would use own implementation
     implementation ts_plugin_libs.httpclient
 

java_console/core_io/core_io.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

java_console/io/io.iml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testFixtures/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="jcip-annotations" level="project" />
+    <orderEntry type="library" exported="" name="jSerialComm" level="project" />
+    <orderEntry type="module" module-name="logging-api" exported="" />
+    <orderEntry type="module" module-name="models" exported="" />
+    <orderEntry type="library" exported="" name="annotations" level="project" />
+    <orderEntry type="module" module-name="inifile" exported="" />
+    <orderEntry type="library" name="mockito-all-1.10.19" level="project" />
+    <orderEntry type="module" module-name="logging" exported="" />
+    <orderEntry type="library" name="javacan-core" level="project" />
+  </component>
+</module>

java_console/shared_io/shared_io.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/src/main">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java/com/rusefi" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="annotations" level="project" />
+  </component>
+</module>

java_console/shared_ui/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-apply from: '../../android/dependencies.gradle'
+apply from: '../../java_tools/dependencies.gradle'
 
 dependencies {
     api project(':core_ui')
@@ -10,6 +10,5 @@ dependencies {
     api project(':models')
     api ts_plugin_libs.httpclient
     api ts_plugin_libs.httpmime
-    api libs.json
+    api global_libs.json
-    testImplementation libs.junit
 }

java_tools/proxy_server/build.gradle

@@ -6,6 +6,12 @@ dependencies {
     implementation project(':logging-api')
     implementation project(':ecu_io')
 
+    compileOnly 'net.jcip:jcip-annotations:1.0'
+    implementation 'org.takes:takes:1.20'
+    implementation 'org.glassfish:javax.json:1.1.4'
+
+    testImplementation testFixtures(project(':ecu_io'))
+
     implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.3'
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3'
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'

java_tools/proxy_server/proxy_server.iml

@@ -16,5 +16,6 @@
     <orderEntry type="library" name="json-simple" level="project" />
     <orderEntry type="library" scope="TEST" name="junit" level="project" />
     <orderEntry type="library" name="log4j-api-2.13.3" level="project" />
+    <orderEntry type="module" module-name="logging" />
   </component>
 </module>