From 6b11e82b86b884661665dddb0486816f1a3cec3a Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sun, 12 Aug 2018 21:20:56 -0500
Subject: [PATCH] Cleanup dependencies

---
 .gitignore                       | 7 ++++---
 DynmapCore/bin/.gitignore        | 1 +
 DynmapCore/build.gradle          | 2 +-
 DynmapCoreAPI/bin/.gitignore     | 1 +
 bukkit-helper-113/bin/.gitignore | 1 +
 bukkit-helper-113/build.gradle   | 4 ++--
 bukkit-helper/.gitignore         | 1 +
 bukkit-helper/bin/.gitignore     | 1 +
 bukkit-helper/build.gradle       | 4 ++--
 bukkit/.gitignore                | 1 +
 10 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 DynmapCore/bin/.gitignore
 create mode 100644 DynmapCoreAPI/bin/.gitignore
 create mode 100644 bukkit-helper-113/bin/.gitignore
 create mode 100644 bukkit-helper/bin/.gitignore

diff --git a/.gitignore b/.gitignore
index ae6d9363..ba7be1ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
 # Eclipse stuff
-/.classpath
-/.project
-/.settings
+.classpath
+.project
+.settings
 
 # netbeans
 /nbproject
 
+
 # we use maven!
 /build.xml
 
diff --git a/DynmapCore/bin/.gitignore b/DynmapCore/bin/.gitignore
new file mode 100644
index 00000000..ddf9c656
--- /dev/null
+++ b/DynmapCore/bin/.gitignore
@@ -0,0 +1 @@
+/main/
diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle
index e3044c29..0f96966d 100644
--- a/DynmapCore/build.gradle
+++ b/DynmapCore/build.gradle
@@ -1,7 +1,7 @@
 description = "DynmapCore"
 
 dependencies {
-    compile "us.dynmap:DynmapCoreAPI:${project.version}"
+    compile project(path: ':DynmapCoreAPI', configuration: 'shadow')
     compile 'org.eclipse.jetty:jetty-server:8.1.21.v20160908'
     compile 'org.eclipse.jetty:jetty-servlet:8.1.21.v20160908'
     compile 'com.googlecode.json-simple:json-simple:1.1.1'
diff --git a/DynmapCoreAPI/bin/.gitignore b/DynmapCoreAPI/bin/.gitignore
new file mode 100644
index 00000000..ddf9c656
--- /dev/null
+++ b/DynmapCoreAPI/bin/.gitignore
@@ -0,0 +1 @@
+/main/
diff --git a/bukkit-helper-113/bin/.gitignore b/bukkit-helper-113/bin/.gitignore
new file mode 100644
index 00000000..ddf9c656
--- /dev/null
+++ b/bukkit-helper-113/bin/.gitignore
@@ -0,0 +1 @@
+/main/
diff --git a/bukkit-helper-113/build.gradle b/bukkit-helper-113/build.gradle
index 382344bf..72d8430a 100644
--- a/bukkit-helper-113/build.gradle
+++ b/bukkit-helper-113/build.gradle
@@ -3,8 +3,8 @@ description = 'bukkit-helper-1.13'
 
 dependencies {
   compile project(':bukkit-helper')
-  compile group: 'us.dynmap', name: 'dynmap-api', version: "${project.version}"
-  compile group: 'us.dynmap', name: 'DynmapCore', version: "${project.version}"
+  compile project(path: ':dynmap-api', configuration: 'shadow')
+  compile project(path: ':DynmapCore', configuration: 'shadow')
   compile group: 'org.bukkit', name: 'bukkit', version:'1.13-R0.1-SNAPSHOT'
   compile group: 'org.bukkit', name: 'craftbukkit', version:'1.13-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper/.gitignore b/bukkit-helper/.gitignore
index 99d2bb15..eeca7fe3 100644
--- a/bukkit-helper/.gitignore
+++ b/bukkit-helper/.gitignore
@@ -1,2 +1,3 @@
 /target/
 /build/
+/bin/
diff --git a/bukkit-helper/bin/.gitignore b/bukkit-helper/bin/.gitignore
new file mode 100644
index 00000000..ddf9c656
--- /dev/null
+++ b/bukkit-helper/bin/.gitignore
@@ -0,0 +1 @@
+/main/
diff --git a/bukkit-helper/build.gradle b/bukkit-helper/build.gradle
index e3cf95ac..d4d40f19 100644
--- a/bukkit-helper/build.gradle
+++ b/bukkit-helper/build.gradle
@@ -2,8 +2,8 @@
 description = 'bukkit-helper'
 
 dependencies {
-  compile group: 'us.dynmap', name: 'dynmap-api', version: "${project.version}"
-  compile group: 'us.dynmap', name: 'DynmapCore', version: "${project.version}"
+  compile project(path: ':dynmap-api', configuration: 'shadow')
+  compile project(path: ':DynmapCore', configuration: 'shadow')
   compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
   compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2'
 }
diff --git a/bukkit/.gitignore b/bukkit/.gitignore
index 72c9368f..f2358cb5 100644
--- a/bukkit/.gitignore
+++ b/bukkit/.gitignore
@@ -1,3 +1,4 @@
 /target/
 /dependency-reduced-pom.xml
 /build/
+/bin/