From a3ba7cdcf2e104bef91a630cd82377bfd1e2ebaf Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Wed, 10 Nov 2021 19:14:09 +0000
Subject: [PATCH] Updated dependency structure

---
 build.gradle                                  | 12 ++++++++++--
 eco-api/build.gradle                          |  9 ---------
 eco-core/core-plugin/build.gradle             |  4 ----
 .../core-plugin/src/main/resources/plugin.yml | 19 ++++++++++++-------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2fdb6f49..8d873dc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,10 +60,18 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'org.jetbrains:annotations:19.0.0'
+        // Adventure
+        api 'net.kyori:adventure-platform-bukkit:4.0.0'
+        api 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
+        api 'net.kyori:adventure-api:4.9.3'
+        api 'net.kyori:adventure-text-serializer-gson:4.9.3'
+        api 'net.kyori:adventure-text-serializer-legacy:4.9.3'
+
+        // Annotations
+        api 'org.jetbrains:annotations:22.0.0'
 
         // Test
-        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
         testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
     }
 
diff --git a/eco-api/build.gradle b/eco-api/build.gradle
index c8d7770b..0e5e6d01 100644
--- a/eco-api/build.gradle
+++ b/eco-api/build.gradle
@@ -6,18 +6,9 @@ group 'com.willfp'
 version rootProject.version
 
 dependencies {
-    // Adventure
-    compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
-    compileOnly 'net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT'
-    compileOnly 'net.kyori:adventure-api:4.9.2'
-    compileOnly 'net.kyori:adventure-text-serializer-gson:4.9.2'
-    compileOnly 'net.kyori:adventure-text-serializer-legacy:4.9.2'
-
-    // Other
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
     compileOnly 'org.apache.maven:maven-artifact:3.8.1'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.7.1-SNAPSHOT'
-    compileOnly 'com.google.code.gson:gson:2.8.8'
 }
 
 java {
diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle
index 753b0a26..37e9a260 100644
--- a/eco-core/core-plugin/build.gradle
+++ b/eco-core/core-plugin/build.gradle
@@ -6,10 +6,6 @@ dependencies {
     implementation('net.kyori:adventure-text-minimessage:4.1.0-SNAPSHOT') {
         exclude group: 'net.kyori', module: 'adventure-api'
     }
-    compileOnly 'net.kyori:adventure-platform-bukkit:4.0.0'
-    compileOnly 'net.kyori:adventure-api:4.9.2'
-    compileOnly 'net.kyori:adventure-text-serializer-gson:4.9.2'
-    compileOnly 'net.kyori:adventure-text-serializer-legacy:4.9.2'
     compileOnly 'org.apache.maven:maven-artifact:3.8.1'
     compileOnly 'com.google.code.gson:gson:2.8.8'
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml
index ceda1f75..9bb43187 100644
--- a/eco-core/core-plugin/src/main/resources/plugin.yml
+++ b/eco-core/core-plugin/src/main/resources/plugin.yml
@@ -39,14 +39,19 @@ softdepend:
 libraries:
   - 'org.reflections:reflections:0.9.12'
   - 'org.apache.maven:maven-artifact:3.0.3'
-  - 'org.jetbrains.kotlin:kotlin-stdlib:1.5.31'
+  - 'com.google.guava:guava:31.0.1-jre'
+
+    # Adventure
   - 'net.kyori:adventure-platform-bukkit:4.0.0'
-  - 'net.kyori:adventure-api:4.9.2'
-  - 'net.kyori:adventure-text-serializer-gson:4.9.2'
-  - 'net.kyori:adventure-text-serializer-legacy:4.9.2'
-  - 'org.jetbrains.kotlin:kotlin-stdlib:1.5.21'
+  - 'net.kyori:adventure-api:4.9.3'
+  - 'net.kyori:adventure-text-serializer-gson:4.9.3'
+  - 'net.kyori:adventure-text-serializer-legacy:4.9.3'
+
+    # Kotlin
+  - 'org.jetbrains.kotlin:kotlin-stdlib:1.5.31'
+
+    # SQL
   - 'org.jetbrains.exposed:exposed-core:0.35.1'
   - 'org.jetbrains.exposed:exposed-dao:0.35.1'
   - 'org.jetbrains.exposed:exposed-jdbc:0.35.1'
-  - 'mysql:mysql-connector-java:8.0.25'
-  - 'com.google.guava:guava:31.0.1-jre'
\ No newline at end of file
+  - 'mysql:mysql-connector-java:8.0.25'
\ No newline at end of file