From c196ced0e26eef7f2610e614c5a26e76b24ad82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?= <sauilitired@gmail.com>
Date: Sat, 11 Apr 2020 02:28:15 +0200
Subject: [PATCH] Move org.json into core

---
 Core/build.gradle | 2 ++
 build.gradle      | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Core/build.gradle b/Core/build.gradle
index a5f7c8be2..a60a67a60 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -4,6 +4,7 @@ repositories {
 def textVersion = "3.0.2"
 
 dependencies {
+    compile group: 'org.json', name: 'json', version: '20190722'
     implementation("org.yaml:snakeyaml:1.25")
     implementation("com.google.code.gson:gson:2.8.6") {
         because("Minecraft uses GSON 2.8.0")
@@ -73,6 +74,7 @@ shadowJar {
         include(dependency("net.kyori:text-serializer-legacy:3.0.2"))
         include(dependency("net.kyori:text-serializer-plain:3.0.2"))
     }
+    relocate("org.json", "com.github.intellectualsites.plotsquared.json")
     relocate('net.kyori.text', 'com.github.intellectualsites.plotsquared.formatting.text')
 }
 
diff --git a/build.gradle b/build.gradle
index 2d6ebf886..baffd4cab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -83,7 +83,6 @@ subprojects {
             exclude(module: "mockito-core")
             exclude(module: "dummypermscompat")
         }
-        compile group: 'org.json', name: 'json', version: '20190722'
 
         implementation("net.kyori:text-api:3.0.2")
         implementation("net.kyori:text-serializer-gson:3.0.2")