let's separate Android from not Android
This commit is contained in:
parent
77c8f38178
commit
f2d6496b80
|
@ -1,5 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
|
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
|
@ -8,8 +9,23 @@
|
||||||
<option name="gradleJvm" value="#JAVA_HOME" />
|
<option name="gradleJvm" value="#JAVA_HOME" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
<set>
|
<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/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$" />
|
||||||
|
<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>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
</GradleProjectSettings>
|
</GradleProjectSettings>
|
||||||
|
|
|
@ -41,11 +41,11 @@ shadowJar {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
to keep only classes from logging
|
to keep only classes from logging
|
||||||
and loggin-api as in build.xml
|
and logging-api as in build.xml
|
||||||
*/
|
*/
|
||||||
dependencies {
|
dependencies {
|
||||||
exclude(dependency(libs.jsr305))
|
exclude(dependency(global_libs.jsr305))
|
||||||
exclude(dependency(libs.junit))
|
exclude(dependency(global_libs.junit))
|
||||||
exclude(dependency(libs.annotations))
|
exclude(dependency(global_libs.annotations))
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -2,3 +2,34 @@ include ':logging-api'
|
||||||
project(':logging-api').projectDir = new File('../java_console/logging-api')
|
project(':logging-api').projectDir = new File('../java_console/logging-api')
|
||||||
include ':gcc_map_reader'
|
include ':gcc_map_reader'
|
||||||
project(':gcc_map_reader').projectDir = new File('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')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue