From 258356e45d284a828a0bae34eef3da1ccd51c746 Mon Sep 17 00:00:00 2001
From: William <will27528@gmail.com>
Date: Sun, 21 Aug 2022 13:09:30 +0100
Subject: [PATCH] Bundle boosted-yaml, adjust shading and build scripts

---
 build.gradle                         | 3 +++
 bukkit/build.gradle                  | 3 ++-
 bukkit/src/main/resources/plugin.yml | 8 ++++----
 common/build.gradle                  | 7 ++++---
 gradle.properties                    | 6 +++++-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2b9ae5e2..ce3b2ea7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,9 @@ version "$ext.plugin_version+${versionMetadata()}"
 
 ext {
     set 'version', version.toString()
+    set 'jedis_version', jedis_version.toString()
+    set 'mysql_driver_version', mysql_driver_version.toString()
+    set 'snappy_version', snappy_version.toString()
 }
 
 import org.apache.tools.ant.filters.ReplaceTokens
diff --git a/bukkit/build.gradle b/bukkit/build.gradle
index 9e0591fb..0942897a 100644
--- a/bukkit/build.gradle
+++ b/bukkit/build.gradle
@@ -7,8 +7,8 @@ dependencies {
 
     compileOnly 'commons-io:commons-io:2.11.0'
     compileOnly 'de.themoep:minedown:1.7.1-SNAPSHOT'
-    compileOnly 'dev.dejvokep:boosted-yaml:1.3'
     compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
+    compileOnly 'dev.dejvokep:boosted-yaml:1.3'
     compileOnly 'com.zaxxer:HikariCP:5.0.1'
 
     testImplementation 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
@@ -25,6 +25,7 @@ shadowJar {
     relocate 'org.jetbrains', 'net.william278.husksync.libraries'
     relocate 'org.intellij', 'net.william278.husksync.libraries'
     relocate 'com.zaxxer', 'net.william278.husksync.libraries'
+    relocate 'dev.dejvokep', 'net.william278.husksync.libraries'
 
     relocate 'me.lucko.commodore', 'net.william278.husksync.libraries.commodore'
     relocate 'net.byteflux.libby', 'net.william278.husksync.libraries.libby'
diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
index bc43f2b2..1487b018 100644
--- a/bukkit/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
@@ -9,10 +9,10 @@ softdepend:
   - MysqlPlayerDataBridge
   - Plan
 libraries:
-  - 'redis.clients:jedis:4.2.3'
-  - 'mysql:mysql-connector-java:8.0.30'
-  - 'org.xerial.snappy:snappy-java:1.1.8.4'
-  - 'dev.dejvokep:boosted-yaml:1.3'
+  - 'redis.clients:jedis:${jedis_version}'
+  - 'mysql:mysql-connector-java:${mysql_driver_version}'
+  - 'org.xerial.snappy:snappy-java:${snappy_version}'
+
 commands:
   husksync:
     usage: '/husksync <update/info/reload/migrate>'
diff --git a/common/build.gradle b/common/build.gradle
index 056ed6c5..9b94a48c 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -2,13 +2,13 @@ dependencies {
     implementation 'commons-io:commons-io:2.11.0'
     implementation 'de.themoep:minedown:1.7.1-SNAPSHOT'
     implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'dev.dejvokep:boosted-yaml:1.3'
     implementation ('com.zaxxer:HikariCP:5.0.1') {
         exclude module: 'slf4j-api'
     }
 
-    compileOnly 'redis.clients:jedis:4.2.3'
-    compileOnly 'dev.dejvokep:boosted-yaml:1.3'
-    compileOnly 'org.xerial.snappy:snappy-java:1.1.8.4'
+    compileOnly 'redis.clients:jedis:' + jedis_version
+    compileOnly 'org.xerial.snappy:snappy-java:' + snappy_version
     compileOnly 'org.jetbrains:annotations:23.0.0'
     compileOnly 'com.github.plan-player-analytics:Plan:5.4.1690'
 
@@ -25,4 +25,5 @@ shadowJar {
     relocate 'org.jetbrains', 'net.william278.husksync.libraries'
     relocate 'org.intellij', 'net.william278.husksync.libraries'
     relocate 'com.zaxxer', 'net.william278.husksync.libraries'
+    relocate 'dev.dejvokep', 'net.william278.husksync.libraries'
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index b749668a..1928bb97 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,4 +4,8 @@ org.gradle.daemon=true
 javaVersion=16
 
 plugin_version=2.0.2
-plugin_archive=husksync
\ No newline at end of file
+plugin_archive=husksync
+
+jedis_version=4.2.3
+mysql_driver_version=8.0.30
+snappy_version=1.1.8.4
\ No newline at end of file