From 5afc9f508b1d2939fdd524af102240e719226395 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Tue, 28 Aug 2018 01:42:35 +0200
Subject: [PATCH] Changed Utilities project dependency structure (instead of
 project, specific Utilities source files are shared)

---
 build.gradle                    | 29 ++++++-----------------------
 scripts/gradle/utilities.gradle | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100644 scripts/gradle/utilities.gradle

diff --git a/build.gradle b/build.gradle
index 5009014..3a0fd37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,8 @@ plugins {
 //    id 'com.github.ben-manes.versions' version '0.16.0'
 }
 
-ext {
-    bcVersion = '1.60'
-    jnaVersion = '4.5.2'
-}
+// common dependencies configuration
+apply from: '../Utilities/scripts/gradle/utilities.gradle'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -51,26 +49,11 @@ repositories {
 }
 
 dependencies {
-    api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    // utilities only
+    api project.ext.utilitiesDeps
 
-    api group: 'com.github.jponge', name: 'lzma-java', version: '1.3'
-    api group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version: '3.1.5'
-
-    api group: 'com.esotericsoftware', name: 'kryo', version: '4.0.2'
-    api group: 'io.netty', name: 'netty-all', version: '4.1.24.Final'
-
-    api group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: bcVersion
-    api group: 'org.bouncycastle', name: 'bcpg-jdk15on', version: bcVersion
-    api group: 'org.bouncycastle', name: 'bcmail-jdk15on', version: bcVersion
-//    api group: 'org.bouncycastle', name: 'bctls-jdk15on', version: bcVersion
-
-    api group: 'org.lwjgl', name: 'lwjgl-xxhash', version: '3.2.0'
-    api group: 'org.javassist', name: 'javassist', version: '3.23.0-GA'
-
-    api group: 'com.dorkbox', name: 'ShellExecutor', version: '1.1+'
-
-    api group: 'net.java.dev.jna', name: 'jna', version: jnaVersion
-    api group: 'net.java.dev.jna', name: 'jna-platform', version: jnaVersion
+//    api 'com.koloboke:koloboke-api-jdk8:1.0.0'
+//    runtime 'com.koloboke:koloboke-impl-jdk8:1.0.0'
 
     // unit testing
     testImplementation group: 'junit', name: 'junit', version: '4.12'
diff --git a/scripts/gradle/utilities.gradle b/scripts/gradle/utilities.gradle
new file mode 100644
index 0000000..64c0644
--- /dev/null
+++ b/scripts/gradle/utilities.gradle
@@ -0,0 +1,27 @@
+ext {
+    bcVersion = '1.60'
+    jnaVersion = '4.5.2'
+
+   utilitiesDeps = [
+       'org.slf4j:slf4j-api:1.7.25',
+
+       'com.github.jponge:lzma-java:1.3',
+       'com.fasterxml.uuid:java-uuid-generator:3.1.5',
+
+       'com.esotericsoftware:kryo:4.0.2',
+       'io.netty:netty-all:4.1.24.Final',
+
+       "org.bouncycastle:bcprov-jdk15on:$bcVersion",
+       "org.bouncycastle:bcpg-jdk15on:$bcVersion",
+       "org.bouncycastle:bcmail-jdk15on:$bcVersion",
+       "org.bouncycastle:bctls-jdk15on:$bcVersion",
+
+       'org.lwjgl:lwjgl-xxhash:3.2.0',
+       'org.javassist:javassist:3.23.0-GA',
+
+       'com.dorkbox:ShellExecutor:1.1+',
+
+       "net.java.dev.jna:jna:$jnaVersion",
+       "net.java.dev.jna:jna-platform:$jnaVersion"
+   ]
+}