Ant should go, gradle is the unified way #4371
This commit is contained in:
parent
969c3fcdc8
commit
c22bb24bbd
|
@ -27,4 +27,9 @@ allprojects {
|
||||||
|
|
||||||
task clean(type: Delete) {
|
task clean(type: Delete) {
|
||||||
delete rootProject.buildDir
|
delete rootProject.buildDir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// gradlew allDeps
|
||||||
|
subprojects {
|
||||||
|
task allDeps(type: DependencyReportTask) {}
|
||||||
|
}
|
||||||
|
|
|
@ -5,7 +5,8 @@ ext {
|
||||||
javaxJson : "javax.json:javax.json-api:1.1.4",
|
javaxJson : "javax.json:javax.json-api:1.1.4",
|
||||||
snakeyaml : "org.yaml:snakeyaml:1.26",
|
snakeyaml : "org.yaml:snakeyaml:1.26",
|
||||||
jsr305 : "com.google.code.findbugs:jsr305:3.0.2",
|
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 = [
|
ts_plugin_libs = [
|
||||||
|
|
|
@ -23,7 +23,7 @@ include ':enum_to_string'
|
||||||
project(':enum_to_string').projectDir = new File('../java_tools/enum_to_string')
|
project(':enum_to_string').projectDir = new File('../java_tools/enum_to_string')
|
||||||
include ':bin2header'
|
include ':bin2header'
|
||||||
project(':bin2header').projectDir = new File('../java_tools/bin2header')
|
project(':bin2header').projectDir = new File('../java_tools/bin2header')
|
||||||
// todo: uncomment me once works include ':config_definition'
|
include ':config_definition'
|
||||||
// todo: uncomment me once works project(':config_definition').projectDir = new File('../java_tools/configuration_definition')
|
project(':config_definition').projectDir = new File('../java_tools/configuration_definition')
|
||||||
include ':ts_plugin_launcher'
|
include ':ts_plugin_launcher'
|
||||||
project(':ts_plugin_launcher').projectDir = new File('../java_tools/ts_plugin_launcher')
|
project(':ts_plugin_launcher').projectDir = new File('../java_tools/ts_plugin_launcher')
|
|
@ -7,5 +7,5 @@ apply from: '../../android/dependencies.gradle'
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':autoupdate')
|
api project(':autoupdate')
|
||||||
api project(':inifile')
|
api project(':inifile')
|
||||||
implementation libs.snakeyaml
|
api libs.snakeyaml
|
||||||
}
|
}
|
|
@ -1,8 +1,42 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'java-library'
|
||||||
id 'com.github.johnrengelman.shadow' version '6.1.0'
|
id 'com.github.johnrengelman.shadow' version '6.1.0'
|
||||||
|
id 'antlr'
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: '../../android/dependencies.gradle'
|
apply from: '../../android/dependencies.gradle'
|
||||||
|
|
||||||
defaultTasks 'shadowJar'
|
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:.*'))
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue