dependency updates; 1.19 runServer and api-version (#8)

* move LuckPerms, PAPI, and Vault deps to version catalog * set runServer minecraftVersion to 1.19 * set plugin.yml api-version to 1.19 * update dependencies (see body) guava 21.0 -> 31.1-jre jdbi 3.28.0 -> 3.30.0 flyway 8.5.10 -> 9.0.1 corn-core 2.3.0-SNAPSHOT -> corn-misc 3.1.0 papi 2.10.9 -> 2.11.2 vault 1.7 -> 1.7.1 luckperms 5.2 -> 5.4 * replace call to deprecated #queryCapability with #hasCapability
broccolai · Jul 16, 2022 · fb51096 · fb51096
1 parent 53b4866
commit fb51096
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 33 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,7 +26,7 @@ subprojects {
         maven("https://papermc.io/repo/repository/maven-public/")
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
         maven("https://jitpack.io")
-        maven("https://repo.broccol.ai/snapshots")
+        maven("https://repo.broccol.ai/releases")
     }
 
     tasks {

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts
@@ -8,15 +8,15 @@ dependencies {
     api(project(":tags-core"))
 
     compileOnly(libs.paper.api)
-    compileOnly("me.clip", "placeholderapi", Versions.PAPI)
-    compileOnly("com.github.MilkBowl", "VaultAPI", Versions.VAULT)
+    compileOnly(libs.papi)
+    compileOnly(libs.vault)
 
     api(libs.cloud.paper)
     api(libs.cloud.extras)
 }
 
 tasks {
     runServer {
-        minecraftVersion("1.18.2")
+        minecraftVersion("1.19")
     }
 }
diff --git a/bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java b/bukkit/src/main/java/broccolai/tags/bukkit/BukkitTagsPlatform.java
@@ -98,11 +98,11 @@ private CommandManager<CommandUser> getCommandManager(
                     user -> user.<BukkitCommandUser>cast().sender()
             );
 
-            if (commandManager.queryCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
+            if (commandManager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
                 commandManager.registerAsynchronousCompletions();
             }
 
-            if (commandManager.queryCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER)) {
+            if (commandManager.hasCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER)) {
                 commandManager.registerBrigadier();
             }
 

diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name : Tags
 version : $version
 main : broccolai.tags.bukkit.BukkitTagsPlatform
-api-version : 1.18
+api-version : 1.19
 depend : [ Vault ]
 softdepend : [ PlaceholderAPI, EssentialsChat, Essentials ]
 permissions :

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,7 +1,7 @@
 dependencies {
     api(project(":tags-api"))
     compileOnlyApi(libs.guava)
-    compileOnly("net.luckperms", "api", Versions.LUCKPERMS)
+    compileOnly(libs.luckperms)
 
     implementation(libs.guice.assisted) {
         isTransitive = false
@@ -13,7 +13,7 @@ dependencies {
 
     implementation(libs.configurate)
 
-    api(libs.corn.core)
+    api(libs.corn.misc)
 
     api(libs.cloud.core)
     api(libs.event.asm)

diff --git a/gradle/libs.versions.conf b/gradle/libs.versions.conf
@@ -26,7 +26,7 @@ versions = {
   mockito = "4.5.1"
 
   # Google
-  guava = "21.0"
+  guava = "31.1-jre"
   gson = "2.9.0"
   guice = "5.1.0"
 
@@ -41,14 +41,14 @@ versions = {
   event = "4.0.0-SNAPSHOT"
 
   # Storage
-  jdbi = "3.28.0"
+  jdbi = "3.30.0"
   hikari = "5.0.1"
-  flyway = "8.5.10"
+  flyway = "9.0.1"
   h2 = "2.1.212"
   configurate = "4.1.2"
 
   # Misc
-  corn = "2.3.0-SNAPSHOT"
+  corn = "3.1.0"
   slf4j = "1.7.30"
   caffeine = "3.1.0"
 
@@ -58,6 +58,11 @@ versions = {
 
   # Velocity
   velocity = "1.1.8"
+
+  # Plugin APIs
+  papi = "2.11.2"
+  vault = "1.7.1"
+  luckperms = "5.4"
 }
 
 dependencies = {
@@ -97,7 +102,7 @@ dependencies = {
   configurate = {group = "org.spongepowered", name = "configurate-hocon", version.ref = "configurate"}
 
   # Misc
-  corn-core = {group = "broccolai.corn", name = "corn-core", version.ref = "corn"}
+  corn-misc = {group = "broccolai.corn", name = "corn-misc", version.ref = "corn"}
   corn-context = {group = "broccolai.corn", name = "corn-context", version.ref = "corn"}
   slf4j = {group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j"}
   caffeine = {group = "com.github.ben-manes.caffeine", name = "caffeine", version.ref = "caffeine"}
@@ -115,6 +120,11 @@ dependencies = {
   junit-api = {group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit"}
   junit-engine = {group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit"}
   mockito = {group = "org.mockito", name = "mockito-inline", version.ref = "mockito"}
+
+  # Plugin APIs
+  papi = {group = "me.clip", name = "placeholderapi", version.ref = "papi"}
+  vault = {group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault"}
+  luckperms = {group = "net.luckperms", name = "api", version.ref = "luckperms"}
 }
 
 bundles = {