From 88686c52a21617d2b91994c45127044c61728b59 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 15 Apr 2025 11:54:51 -0500 Subject: [PATCH] Update dependencies --- build.gradle.kts | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- proxy/build.gradle.kts | 10 +++++----- server/build.gradle.kts | 20 +++++++++---------- .../main/java/dev/plex/util/BungeeUtil.java | 1 - 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d52a551..9c91c15 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("java") id("maven-publish") - id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.9" + id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.10" id("net.kyori.blossom") version "2.1.0" - id("com.gradleup.shadow") version "8.3.3" + id("com.gradleup.shadow") version "9.0.0-beta12" } group = "dev.plex" @@ -78,7 +78,7 @@ tasks.clean { }) } -tasks.create("copyJars") { +tasks.register("copyJars", fun Copy.() { dependsOn(tasks.jar) duplicatesStrategy = DuplicatesStrategy.EXCLUDE from(subprojects.map { @@ -88,4 +88,4 @@ tasks.create("copyJars") { it.project.tasks.jar }) into(file("build/libs")) -} \ No newline at end of file +}) \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts index 4762a8d..0a0ebfb 100644 --- a/proxy/build.gradle.kts +++ b/proxy/build.gradle.kts @@ -39,9 +39,9 @@ publishing { } dependencies { - compileOnly("org.projectlombok:lombok:1.18.34") - annotationProcessor("org.projectlombok:lombok:1.18.34") - compileOnly("org.json:json:20240303") - compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") - annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") + compileOnly("org.projectlombok:lombok:1.18.38") + annotationProcessor("org.projectlombok:lombok:1.18.38") + compileOnly("org.json:json:20250107") + compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") + annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") } \ No newline at end of file diff --git a/server/build.gradle.kts b/server/build.gradle.kts index e8f02f5..30fdb31 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -5,7 +5,7 @@ import java.util.* plugins { id("net.kyori.indra.git") version "3.1.3" - id("net.minecrell.plugin-yml.paper") version "0.6.0" + id("de.eldoria.plugin-yml.paper") version "0.7.1" } repositories { @@ -14,15 +14,15 @@ repositories { } dependencies { - library("org.projectlombok:lombok:1.18.34") - library("org.json:json:20240303") - library("commons-io:commons-io:2.17.0") - library("redis.clients:jedis:5.2.0") - library("org.mariadb.jdbc:mariadb-java-client:3.4.1") - library("com.zaxxer:HikariCP:6.0.0") + library("org.projectlombok:lombok:1.18.38") + library("org.json:json:20250107") + library("commons-io:commons-io:2.19.0") + library("redis.clients:jedis:6.0.0-beta2") + library("org.mariadb.jdbc:mariadb-java-client:3.5.3") + library("com.zaxxer:HikariCP:6.3.0") library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") - library("org.jetbrains:annotations:26.0.1") - compileOnly("io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT") + library("org.jetbrains:annotations:26.0.2") + compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT") compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") { exclude("org.bukkit", "bukkit") } @@ -34,7 +34,7 @@ dependencies { implementation("com.github.LeonMangler:SuperVanish:6.2.18-3") - annotationProcessor("org.projectlombok:lombok:1.18.34") + annotationProcessor("org.projectlombok:lombok:1.18.38") } group = rootProject.group diff --git a/server/src/main/java/dev/plex/util/BungeeUtil.java b/server/src/main/java/dev/plex/util/BungeeUtil.java index adb75a0..a565b61 100644 --- a/server/src/main/java/dev/plex/util/BungeeUtil.java +++ b/server/src/main/java/dev/plex/util/BungeeUtil.java @@ -21,7 +21,6 @@ public class BungeeUtil return Bukkit.spigot().getPaperConfig().getBoolean("settings.velocity-support.enabled") && !Bukkit.spigot().getPaperConfig().getString("settings.velocity-support.secret", "").isEmpty(); } - @SuppressWarnings("UnstableApiUsage") public static void kickPlayer(Player player, Component message) { if (PROXIED_SERVER)