From 3bb6db463647472cace473db878060e4e4a68400 Mon Sep 17 00:00:00 2001
From: SamB440 <sam@islandearth.net>
Date: Sat, 12 Jun 2021 16:45:39 +0100
Subject: [PATCH] Require 1.17, use 1.17 libraries feature, update hikari

---
 build.gradle                             | 10 +++++++++-
 rpgregions/build.gradle                  | 15 +++++++++++----
 rpgregions/src/main/resources/plugin.yml | 11 +++++------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index a8b2cd7..aced65e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,15 @@ dependencies {
     implementation project(':api')
 }
 
-shadowJar {
+tasks.shadowJar {
+    dependencies {
+        exclude(dependency {
+            it.moduleGroup == 'commons-io'
+        })
+        exclude(dependency {
+            it.moduleGroup == 'commons-codec'
+        })
+    }
     relocate 'net.islandearth.languagy', 'net.islandearth.rpgregions.libs.languagy'
     relocate 'co.aikar.commands', 'net.islandearth.rpgregions.libs.acf'
     relocate 'co.aikar.idb', 'net.islandearth.rpgregions.libs.idb'
diff --git a/rpgregions/build.gradle b/rpgregions/build.gradle
index 42356cc..c6af7d9 100644
--- a/rpgregions/build.gradle
+++ b/rpgregions/build.gradle
@@ -1,4 +1,5 @@
 plugins {
+    id 'com.github.johnrengelman.shadow'
     id 'java'
 }
 
@@ -57,9 +58,6 @@ dependencies {
     implementation 'com.gitlab.samb440:languagy:2.0.3-RELEASE' // languagy
     implementation 'co.aikar:acf-paper:0.5.0-SNAPSHOT' // commands
     implementation 'co.aikar:idb-core:1.0.0-SNAPSHOT' // database
-    implementation 'com.zaxxer:HikariCP:2.4.1' // database
-    implementation 'org.apache.commons:commons-lang3:3.6' // apache commons (included as it has changed in versions)
-    implementation 'com.github.stefvanschie.inventoryframework:IF:0.9.8' // inventory framework
     implementation 'org.bstats:bstats-bukkit:2.2.1' // plugin stats
     implementation 'io.papermc:paperlib:1.0.4' // paperlib - async teleport on Paper
 
@@ -72,9 +70,13 @@ dependencies {
         exclude group: 'org.bukkit'
         exclude group: 'org.spigotmc'
     }
+    compileOnly 'com.github.stefvanschie.inventoryframework:IF:0.9.8' // IMPLEMENTED VIA LIBRARIES - inventory framework
+    compileOnly 'com.zaxxer:HikariCP:2.4.1' // IMPLEMENTED VIA LIBRARIES - database
     compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT' // spigot
     compileOnly 'me.clip:placeholderapi:2.10.4' // PAPI
-    compileOnly 'com.github.MilkBowl:VaultAPI:1.7' // vault
+    compileOnly ('com.github.MilkBowl:VaultAPI:1.7') { // vault
+        exclude group: 'org.bukkit'
+    }
     compileOnly name: 'AlonsoLevels_v2.0-BETA' // alonsolevels
     compileOnly name: 'Quests-4.0.1' // quests
     compileOnly 'com.github.shynixn.headdatabase:hdb-api:1.0' // head database
@@ -86,6 +88,11 @@ dependencies {
     compileOnly project(':api')
 }
 
+configurations.all {
+    exclude group: 'commons-io'
+    exclude group: 'commons-codec'
+}
+
 javadoc {
     exclude 'net/islandearth/rpgregions/translation/**'
     exclude 'net/islandearth/rpgregions/listener/**'
diff --git a/rpgregions/src/main/resources/plugin.yml b/rpgregions/src/main/resources/plugin.yml
index 17911f9..17d3380 100644
--- a/rpgregions/src/main/resources/plugin.yml
+++ b/rpgregions/src/main/resources/plugin.yml
@@ -1,12 +1,11 @@
 name: RPGRegions
 version: @version@
 main: net.islandearth.rpgregions.RPGRegions
-api-version: '1.16'
+api-version: '1.17'
+libraries:
+  - "com.zaxxer:HikariCP:4.0.3" # database
+  - "com.github.stefvanschie.inventoryframework:IF:0.9.8" # inventory framework
 softdepend: [Hyperverse, Multiverse, Languagy, UltraRegions, WorldGuard, PlaceholderAPI, HeadDatabase, Residence, Plan, GriefPrevention, Vault, MythicMobs, AlonsoLevels, Dynmap]
 authors: [SamB440]
 description: Discoverable regions
-website: https://fortitude.islandearth.net
-commands:
-  rpgregions:
-    usage: /rpgregions
-    description: Base RPGRegions command
+website: https://fortitude.islandearth.net
\ No newline at end of file