rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

let's separate Android from not Android

This commit is contained in:
rusefillc 2022-10-15 11:27:25 -04:00
parent 85f23ef67c
commit fdcdece2b0
6 changed files with 5 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java_console/autoupdate/autoupdate.iml
View File

@ -1,13 +0,0 @@
<?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" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="annotations" level="project" />
<orderEntry type="module" module-name="shared_io" />
</component>
</module>

23
java_console/io/io.iml
View File

@ -1,23 +0,0 @@
<?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>

6
java_console/shared_io/build.gradle
View File

@ -1,9 +1,3 @@
plugins {
id 'java'
}
apply from: '../../android/dependencies.gradle'
dependencies {
testImplementation libs.junit
}

17
java_console/shared_io/shared_io.iml
View File

@ -1,17 +0,0 @@
<?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" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="json-simple" level="project" />
<orderEntry type="library" exported="" name="httpclient" level="project" />
<orderEntry type="library" exported="" name="annotations" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit" level="project" />
</component>
</module>

3
java_tools/proxy_server/build.gradle
View File

@ -3,6 +3,9 @@ plugins {
}
dependencies {
implementation project(':logging-api')
implementation 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'

2
java_tools/settings.gradle
View File

@ -1,3 +1,5 @@
//todo include ':proxy_server'
//todo project(':proxy_server').projectDir = new File('proxy_server')
include ':logging-api'
project(':logging-api').projectDir = new File('../java_console/logging-api')
include ':gcc_map_reader'