From 9966ade2f2d50390d6d13fe267944f7655692ff5 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Mon, 26 Feb 2024 12:49:46 +0800 Subject: [PATCH] update to gradle 8.6 --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../customfishing/libraries/dependencies/Dependency.java | 2 +- .../momirealms/customfishing/version/VersionManagerImpl.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 744c64d1..509c4a29 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java b/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java index d92226c1..cf629167 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java +++ b/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java @@ -296,7 +296,7 @@ public enum Dependency { COMMONS_POOL_2( "org{}apache{}commons", "commons-pool2", - "2.11.0", + "2.12.0", null, "commons-pool2", Relocation.of("commonspool2", "org{}apache{}commons{}pool2") diff --git a/plugin/src/main/java/net/momirealms/customfishing/version/VersionManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/version/VersionManagerImpl.java index 78d82552..6b45de8f 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/version/VersionManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/version/VersionManagerImpl.java @@ -53,7 +53,6 @@ public class VersionManagerImpl implements VersionManager { String[] split = serverVersion.split("_"); int main_ver = Integer.parseInt(split[1]); - // Determine if the server version is newer than 1_19_R2 and 1_20_R1 if (main_ver >= 20) { isNewerThan1_19_R2 = true; isNewerThan1_19_R3 = true;