From 529c6dd2427303ba4e301c6d0b7248a4ea8e5e88 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 12 Jul 2020 18:53:53 -0400 Subject: [PATCH] helping Android --- android/app/build.gradle | 3 +++ java_console/io/build.gradle | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/android/app/build.gradle b/android/app/build.gradle index ed135c3cd0..fe32601b59 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,6 +1,9 @@ apply plugin: 'com.android.application' android { + packagingOptions { + exclude 'META-INF/DEPENDENCIES' + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle index 496beac45f..85803cffb1 100644 --- a/java_console/io/build.gradle +++ b/java_console/io/build.gradle @@ -2,6 +2,10 @@ plugins { id 'java' } +configurations { + compile.exclude group: "junit", module: "junit" +} + dependencies { implementation project(':inifile') implementation project(':models') @@ -10,6 +14,8 @@ dependencies { implementation group: 'org.jetbrains', name: 'annotations', version: '16.0.1' implementation group: 'com.fazecast', name: 'jSerialComm', version: '2.6.2' 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' testImplementation group: 'junit', name: 'junit', version: '4.13' } \ No newline at end of file