Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-04-21 09:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Telesphoreo 2025-04-15 11:54:51 -05:00
parent 40e0bb0845
commit 88686c52a2
No known key found for this signature in database
GPG Key ID: 9D1991811E093C02
5 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -1,9 +1,9 @@
plugins { plugins {
id("java") id("java")
id("maven-publish") 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("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" group = "dev.plex"
@ -78,7 +78,7 @@ tasks.clean {
}) })
} }
tasks.create<Copy>("copyJars") { tasks.register<Copy>("copyJars", fun Copy.() {
dependsOn(tasks.jar) dependsOn(tasks.jar)
duplicatesStrategy = DuplicatesStrategy.EXCLUDE duplicatesStrategy = DuplicatesStrategy.EXCLUDE
from(subprojects.map { from(subprojects.map {
@ -88,4 +88,4 @@ tasks.create<Copy>("copyJars") {
it.project.tasks.jar it.project.tasks.jar
}) })
into(file("build/libs")) into(file("build/libs"))
} })

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

10
proxy/build.gradle.kts
View File

@ -39,9 +39,9 @@ publishing {
} }
dependencies { dependencies {
compileOnly("org.projectlombok:lombok:1.18.34") compileOnly("org.projectlombok:lombok:1.18.38")
annotationProcessor("org.projectlombok:lombok:1.18.34") annotationProcessor("org.projectlombok:lombok:1.18.38")
compileOnly("org.json:json:20240303") compileOnly("org.json:json:20250107")
compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
} }

20
server/build.gradle.kts
View File

@ -5,7 +5,7 @@ import java.util.*
plugins { plugins {
id("net.kyori.indra.git") version "3.1.3" 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 { repositories {
@ -14,15 +14,15 @@ repositories {
} }
dependencies { dependencies {
library("org.projectlombok:lombok:1.18.34") library("org.projectlombok:lombok:1.18.38")
library("org.json:json:20240303") library("org.json:json:20250107")
library("commons-io:commons-io:2.17.0") library("commons-io:commons-io:2.19.0")
library("redis.clients:jedis:5.2.0") library("redis.clients:jedis:6.0.0-beta2")
library("org.mariadb.jdbc:mariadb-java-client:3.4.1") library("org.mariadb.jdbc:mariadb-java-client:3.5.3")
library("com.zaxxer:HikariCP:6.0.0") library("com.zaxxer:HikariCP:6.3.0")
library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22")
library("org.jetbrains:annotations:26.0.1") library("org.jetbrains:annotations:26.0.2")
compileOnly("io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT") compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") { compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") {
exclude("org.bukkit", "bukkit") exclude("org.bukkit", "bukkit")
} }
@ -34,7 +34,7 @@ dependencies {
implementation("com.github.LeonMangler:SuperVanish:6.2.18-3") 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 group = rootProject.group

1
server/src/main/java/dev/plex/util/BungeeUtil.java
View File

@ -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(); 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) public static void kickPlayer(Player player, Component message)
{ {
if (PROXIED_SERVER) if (PROXIED_SERVER)