From 730484a71b6255b23922fd178fdbca50b38acdb7 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 15 Oct 2022 18:13:04 -0400 Subject: [PATCH] let's separate Android from not Android --- android/app/build.gradle | 9 +++------ android/build.gradle | 5 +++-- android/dependencies.gradle | 11 ----------- java_console/autotests/autotests.iml | 11 +++++++++++ java_console/autoupdate/build.gradle | 2 +- java_console/core_io/core_io.iml | 11 +++++++++++ java_console/io/io.iml | 23 +++++++++++++++++++++++ java_console/shared_io/shared_io.iml | 12 ++++++++++++ java_console/shared_ui/build.gradle | 5 ++--- java_tools/proxy_server/build.gradle | 6 ++++++ java_tools/proxy_server/proxy_server.iml | 1 + 11 files changed, 73 insertions(+), 23 deletions(-) create mode 100644 java_console/autotests/autotests.iml create mode 100644 java_console/core_io/core_io.iml create mode 100644 java_console/io/io.iml create mode 100644 java_console/shared_io/shared_io.iml diff --git a/android/app/build.gradle b/android/app/build.gradle index 5e5bc2d52d..b2696f7560 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -37,9 +37,9 @@ android { } buildTypes { - debug { - minifyEnabled false - } + debug { + minifyEnabled false + } release { minifyEnabled false signingConfig signingConfigs.release @@ -51,7 +51,6 @@ dependencies { implementation project(':ecu_io') implementation project(':logging-api') implementation project(':models') - implementation libs.annotations def acraVersion = '5.7.0' implementation "ch.acra:acra-http:$acraVersion" @@ -72,8 +71,6 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - - testImplementation libs.junit } /* diff --git a/android/build.gradle b/android/build.gradle index fb5d4f309e..f5936a5878 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,6 +9,7 @@ buildscript { } apply from: 'dependencies.gradle' +apply from: '../java_tools/dependencies.gradle' allprojects { repositories { @@ -19,8 +20,8 @@ allprojects { plugins.withType(JavaPlugin) { dependencies { - implementation libs.annotations - testImplementation libs.junit + implementation global_libs.annotations + testImplementation global_libs.junit } } } diff --git a/android/dependencies.gradle b/android/dependencies.gradle index c8168497ac..69ae069487 100644 --- a/android/dependencies.gradle +++ b/android/dependencies.gradle @@ -1,19 +1,8 @@ ext { libs = [ - junit : "junit:junit:4.13", mockito : "org.mockito:mockito-all:1.10.19", - annotations : "org.jetbrains:annotations:16.0.1", 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", - json : "com.googlecode.json-simple:json-simple:1.1.1", - ] - - ts_plugin_libs = [ - httpclient : "org.apache.httpcomponents:httpclient:4.5.12", - httpcore : "org.apache.httpcomponents:httpcore:4.4.13", - httpmime : "org.apache.httpcomponents:httpmime:4.5.12", - launcher_api: fileTree( dir: "lib", include: "TunerStudioPluginAPI.jar" ) ] } \ No newline at end of file diff --git a/java_console/autotests/autotests.iml b/java_console/autotests/autotests.iml new file mode 100644 index 0000000000..c90834f2d6 --- /dev/null +++ b/java_console/autotests/autotests.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/java_console/autoupdate/build.gradle b/java_console/autoupdate/build.gradle index 4398e698b9..a50b82c57e 100644 --- a/java_console/autoupdate/build.gradle +++ b/java_console/autoupdate/build.gradle @@ -15,7 +15,7 @@ dependencies { api project(':core_io') api group: 'net.jcip', name: 'jcip-annotations', version: '1.0' - api libs.json + api global_libs.json // not 'api' since Android would use own implementation implementation ts_plugin_libs.httpclient diff --git a/java_console/core_io/core_io.iml b/java_console/core_io/core_io.iml new file mode 100644 index 0000000000..c90834f2d6 --- /dev/null +++ b/java_console/core_io/core_io.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/java_console/io/io.iml b/java_console/io/io.iml new file mode 100644 index 0000000000..d76e80ee0f --- /dev/null +++ b/java_console/io/io.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/java_console/shared_io/shared_io.iml b/java_console/shared_io/shared_io.iml new file mode 100644 index 0000000000..ffe821c218 --- /dev/null +++ b/java_console/shared_io/shared_io.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/java_console/shared_ui/build.gradle b/java_console/shared_ui/build.gradle index 91701193f4..23237adc14 100644 --- a/java_console/shared_ui/build.gradle +++ b/java_console/shared_ui/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java-library' } -apply from: '../../android/dependencies.gradle' +apply from: '../../java_tools/dependencies.gradle' dependencies { api project(':core_ui') @@ -10,6 +10,5 @@ dependencies { api project(':models') api ts_plugin_libs.httpclient api ts_plugin_libs.httpmime - api libs.json - testImplementation libs.junit + api global_libs.json } \ No newline at end of file diff --git a/java_tools/proxy_server/build.gradle b/java_tools/proxy_server/build.gradle index 3005f2df9c..01a55d6948 100644 --- a/java_tools/proxy_server/build.gradle +++ b/java_tools/proxy_server/build.gradle @@ -6,6 +6,12 @@ dependencies { implementation project(':logging-api') implementation project(':ecu_io') + compileOnly 'net.jcip:jcip-annotations:1.0' + implementation 'org.takes:takes:1.20' + implementation 'org.glassfish:javax.json:1.1.4' + + testImplementation testFixtures(project(':ecu_io')) + implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.3' implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3' implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' diff --git a/java_tools/proxy_server/proxy_server.iml b/java_tools/proxy_server/proxy_server.iml index e9e81508f0..3c371b013f 100644 --- a/java_tools/proxy_server/proxy_server.iml +++ b/java_tools/proxy_server/proxy_server.iml @@ -16,5 +16,6 @@ + \ No newline at end of file