diff --git a/android/build.gradle b/android/build.gradle index acfd9e6510..e32b297a24 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,4 +27,9 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} + +// gradlew allDeps +subprojects { + task allDeps(type: DependencyReportTask) {} +} diff --git a/android/dependencies.gradle b/android/dependencies.gradle index 71534f85b7..12912fc8e6 100644 --- a/android/dependencies.gradle +++ b/android/dependencies.gradle @@ -5,7 +5,8 @@ ext { 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" + commons_logging: "commons-logging:commons-logging:1.2", + antlr : "org.antlr:antlr4:4.9.3", // use ANTLR version 4 ] ts_plugin_libs = [ diff --git a/android/settings.gradle b/android/settings.gradle index b116e02248..4712f8e2ce 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -23,7 +23,7 @@ include ':enum_to_string' project(':enum_to_string').projectDir = new File('../java_tools/enum_to_string') include ':bin2header' project(':bin2header').projectDir = new File('../java_tools/bin2header') -// todo: uncomment me once works include ':config_definition' -// todo: uncomment me once works project(':config_definition').projectDir = new File('../java_tools/configuration_definition') +include ':config_definition' +project(':config_definition').projectDir = new File('../java_tools/configuration_definition') include ':ts_plugin_launcher' project(':ts_plugin_launcher').projectDir = new File('../java_tools/ts_plugin_launcher') \ No newline at end of file diff --git a/java_console/models/build.gradle b/java_console/models/build.gradle index 8539439ffa..438216c43b 100644 --- a/java_console/models/build.gradle +++ b/java_console/models/build.gradle @@ -7,5 +7,5 @@ apply from: '../../android/dependencies.gradle' dependencies { api project(':autoupdate') api project(':inifile') - implementation libs.snakeyaml + api libs.snakeyaml } \ No newline at end of file diff --git a/java_tools/configuration_definition/build.gradle b/java_tools/configuration_definition/build.gradle index 672109a5b7..d021a6229b 100644 --- a/java_tools/configuration_definition/build.gradle +++ b/java_tools/configuration_definition/build.gradle @@ -1,8 +1,42 @@ plugins { id 'java-library' id 'com.github.johnrengelman.shadow' version '6.1.0' + id 'antlr' } apply from: '../../android/dependencies.gradle' -defaultTasks 'shadowJar' \ No newline at end of file +defaultTasks 'shadowJar' + +dependencies { + implementation project(':logging') + implementation project(':models') + implementation project(':enum_to_string') + antlr libs.antlr +} + +shadowJar { + /* + to exclude suffix '-all' + in resulting archive file name + */ + archiveBaseName = 'ConfigDefinition' + archiveClassifier = '' + + destinationDirectory = file( '$rootDir/../..' ) + manifest { + attributes( + 'Main-Class': 'com.rusefi.ConfigDefinition' + ) + } + /* + to keep only classes from logging + and loggin-api as in build.xml + */ + dependencies { + exclude(dependency(libs.jsr305)) + exclude(dependency(libs.junit)) + exclude(dependency(libs.annotations)) + exclude(dependency('com.ibm.icu:icu4j:.*')) + } +} \ No newline at end of file