diff --git a/java_console/autoupdate/build.gradle b/java_console/autoupdate/build.gradle index c3ffa77c08..baa948e11f 100644 --- a/java_console/autoupdate/build.gradle +++ b/java_console/autoupdate/build.gradle @@ -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') diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle index b908ac9851..7833a51d2a 100644 --- a/java_console/io/build.gradle +++ b/java_console/io/build.gradle @@ -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') diff --git a/java_console/models/build.gradle b/java_console/models/build.gradle index fd7862c25b..a47862a4f3 100644 --- a/java_console/models/build.gradle +++ b/java_console/models/build.gradle @@ -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 } \ No newline at end of file diff --git a/java_tools/dependencies.gradle b/java_tools/dependencies.gradle index 3ef346e3cc..7b162012ca 100644 --- a/java_tools/dependencies.gradle +++ b/java_tools/dependencies.gradle @@ -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 = [