let's separate Android from not Android
This commit is contained in:
parent
6953efa358
commit
e037183e74
|
@ -2,14 +2,16 @@ plugins {
|
|||
id 'java-library'
|
||||
}
|
||||
|
||||
apply from: '../../android/dependencies.gradle'
|
||||
apply from: '../../java_tools/dependencies.gradle'
|
||||
|
||||
defaultTasks 'shadowJar'
|
||||
|
||||
configurations {
|
||||
all*.exclude group: 'org.hamcrest', module: 'hamcrest-core'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api libs.javaxJson
|
||||
api global_libs.javaxJson
|
||||
api project(':logging-api')
|
||||
api project(':core_ui')
|
||||
api project(':core_io')
|
||||
|
|
|
@ -15,7 +15,7 @@ tasks.withType(Test) {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
implementation libs.javaxJson
|
||||
implementation global_libs.javaxJson
|
||||
api project(':models')
|
||||
api project(':core_io')
|
||||
api project(':logging')
|
||||
|
|
|
@ -2,9 +2,9 @@ plugins {
|
|||
id 'java-library'
|
||||
}
|
||||
|
||||
apply from: '../../android/dependencies.gradle'
|
||||
apply from: '../../java_tools/dependencies.gradle'
|
||||
|
||||
dependencies {
|
||||
api project(':inifile')
|
||||
api libs.snakeyaml
|
||||
api global_libs.snakeyaml
|
||||
}
|
|
@ -6,6 +6,8 @@ ext {
|
|||
antlr : "org.antlr:antlr4:4.9.3", // use ANTLR version 4
|
||||
json : "com.googlecode.json-simple:json-simple:1.1.1",
|
||||
mockito : "org.mockito:mockito-all:1.10.19",
|
||||
javaxJson : "javax.json:javax.json-api:1.1.4",
|
||||
snakeyaml : "org.yaml:snakeyaml:1.26",
|
||||
]
|
||||
|
||||
ts_plugin_libs = [
|
||||
|
|
Loading…
Reference in New Issue