From faececd647e6956486415e71a01873ecb19c5a4b Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Fri, 16 Jan 2015 16:03:40 +0100 Subject: [PATCH] Gradle: changed to local json-simple module --- .../build.gradle | 3 +-- java/org.json.simple/build.gradle | 7 +++++++ mobile/com.sap.sailing.android.shared/build.gradle | 3 +-- settings.gradle | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 java/org.json.simple/build.gradle diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/build.gradle b/java/com.sap.sailing.server.gateway.serialization.shared.android/build.gradle index b8988278d5c..953d75e0a4f 100644 --- a/java/com.sap.sailing.server.gateway.serialization.shared.android/build.gradle +++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/build.gradle @@ -7,10 +7,9 @@ sourceSets { } dependencies { - compile "com.googlecode.json-simple:json-simple:1.1.1" - /* local dependencies */ compile project(":java:com.sap.sailing.domain.common") compile project(":java:com.sap.sailing.domain.shared.android") compile project(":java:com.sap.sse.common") + compile project(":java:org.json.simple") } diff --git a/java/org.json.simple/build.gradle b/java/org.json.simple/build.gradle new file mode 100644 index 00000000000..f0a8d88d703 --- /dev/null +++ b/java/org.json.simple/build.gradle @@ -0,0 +1,7 @@ +apply plugin: "java" + +sourceSets { + main { + java.srcDirs = ["src"] + } +} diff --git a/mobile/com.sap.sailing.android.shared/build.gradle b/mobile/com.sap.sailing.android.shared/build.gradle index 3d7d17c4b8c..9bfe57ecce2 100644 --- a/mobile/com.sap.sailing.android.shared/build.gradle +++ b/mobile/com.sap.sailing.android.shared/build.gradle @@ -30,8 +30,6 @@ android { } dependencies { - compile "com.googlecode.json-simple:json-simple:1.1.1" - /* support libraries */ compile "com.android.support:appcompat-v7:21.0.3" @@ -40,6 +38,7 @@ dependencies { compile project(":java:com.sap.sailing.domain.shared.android") compile project(":java:com.sap.sailing.server.gateway.serialization.shared.android") compile project(":java:com.sap.sse.common") + compile project(":java:org.json.simple") /* all local jar-libs */ // compile fileTree(dir: "libs", include: ["*.jar"]) diff --git a/settings.gradle b/settings.gradle index a925dae3457..95c89535568 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,11 +1,12 @@ -/* web and common stuff */ +// web and common stuff include ":java:com.sap.sailing.domain.common" include ":java:com.sap.sailing.domain.shared.android" include ":java:com.sap.sailing.server.gateway.serialization.shared.android" include ":java:com.sap.sse.common" include ":java:com.sap.sse.datamining.shared" +include ":java:org.json.simple" -/* android projects */ +// android projects include ":mobile:com.sap.sailing.android.shared" include ":mobile:com.sap.sailing.android.tracking.app" include ":mobile:com.sap.sailing.racecommittee.app"