diff --git a/android/dependencies.gradle b/android/dependencies.gradle index 12912fc8e6..401f272ad7 100644 --- a/android/dependencies.gradle +++ b/android/dependencies.gradle @@ -7,6 +7,7 @@ ext { jsr305 : "com.google.code.findbugs:jsr305:3.0.2", commons_logging: "commons-logging:commons-logging:1.2", antlr : "org.antlr:antlr4:4.9.3", // use ANTLR version 4 + json : "com.googlecode.json-simple:json-simple:1.1.1", ] ts_plugin_libs = [ diff --git a/java_console/autoupdate/build.gradle b/java_console/autoupdate/build.gradle index 0745f7ffed..2b874349ad 100644 --- a/java_console/autoupdate/build.gradle +++ b/java_console/autoupdate/build.gradle @@ -14,9 +14,9 @@ dependencies { api project(':shared_io') api group: 'net.jcip', name: 'jcip-annotations', version: '1.0' - api group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' + api libs.json // not 'api' since Android would use own implementation - implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12' + implementation ts_plugin_libs.httpclient // junit 4.13 does not mix well with httpclient :( testImplementation group: 'junit', name: 'junit', version: '4.8.2' diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle index 07110502d8..37c685345c 100644 --- a/java_console/io/build.gradle +++ b/java_console/io/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'java' + id 'java-library' } apply from: '../../android/dependencies.gradle' @@ -24,8 +24,8 @@ dependencies { implementation group: 'com.fazecast', name: 'jSerialComm', version: '2.9.2' implementation group: 'tel.schich', name: 'javacan-core', version: '3.2.0' implementation group: 'net.jcip', name: 'jcip-annotations', version: '1.0' - implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' - implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12' + implementation libs.json + implementation ts_plugin_libs.httpclient // junit 4.13 does not mix well with httpclient :( testImplementation group: 'junit', name: 'junit', version: '4.8.2'