diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2ffead7..e6666cb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,13 +2,13 @@ kotlin = "2.0.0" blossom = "2.1.0" shadow = "8.1.1" -spigot = "1.19.4-R0.1-SNAPSHOT" -bungeecord = "1.19-R0.1-SNAPSHOT" +spigot = "1.20.4-R0.1-SNAPSHOT" +bungeecord = "1.20-R0.1-SNAPSHOT" velocity = "3.1.1" -hutool = "6.0.0-M11" -netty = "4.1.97.Final" -placeholderapi = "2.11.5" -nightconfig = "3.6.7" +hutool = "6.0.0-M13" +netty = "4.1.111.Final" +placeholderapi = "2.11.6" +nightconfig = "3.7.3" bstats = "3.0.2" [plugins] @@ -24,6 +24,7 @@ velocity = { module = "com.velocitypowered:velocity-api", version.ref = "velocit # hutool hutool-core = { module = "org.dromara.hutool:hutool-core", version.ref = "hutool" } hutool-http = { module = "org.dromara.hutool:hutool-http", version.ref = "hutool" } +hutool-log = { module = "org.dromara.hutool:hutool-log", version.ref = "hutool" } hutool-json = { module = "org.dromara.hutool:hutool-json", version.ref = "hutool" } # netty netty-buffer = { module = "io.netty:netty-buffer", version.ref = "netty" } @@ -38,5 +39,5 @@ bstats-bungeecord = { module = "org.bstats:bstats-bungeecord", version.ref = "bs bstats-velocity = { module = "org.bstats:bstats-velocity", version.ref = "bstats" } [bundles] -hutool = ["hutool-core", "hutool-http", "hutool-json"] +hutool = ["hutool-core", "hutool-http", "hutool-log", "hutool-json"] nightconfig = ["nightconfig-core", "nightconfig-toml"] \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/zmusic-runtime/src/main/java/me/zhenxin/zmusic/ZMusicRuntime.java b/zmusic-runtime/src/main/java/me/zhenxin/zmusic/ZMusicRuntime.java index 21a55de..9de1d64 100644 --- a/zmusic-runtime/src/main/java/me/zhenxin/zmusic/ZMusicRuntime.java +++ b/zmusic-runtime/src/main/java/me/zhenxin/zmusic/ZMusicRuntime.java @@ -21,6 +21,10 @@ value = "!org.dromara.hutool:hutool-http:" + ZMusicConstants.HUTOOL_VERSION, test = "!org.dromara.hutool.http.HttpUtil" ) +@RuntimeDependency( + value = "!org.dromara.hutool:hutool-log:" + ZMusicConstants.HUTOOL_VERSION, + test = "!org.dromara.hutool.log.LogUtil" +) @RuntimeDependency( value = "!org.dromara.hutool:hutool-json:" + ZMusicConstants.HUTOOL_VERSION, test = "!org.dromara.hutool.json.JSONUtil" diff --git a/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/Repository.java b/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/Repository.java index db82757..aad4649 100644 --- a/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/Repository.java +++ b/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/Repository.java @@ -24,7 +24,7 @@ public class Repository extends AbstractXmlParser { /** * 中央仓库地址 */ - private static final String MAVEN_CENTRAL = "https://repo.nju.edu.cn/repository/maven-public"; + private static final String MAVEN_CENTRAL = "https://mirrors.huaweicloud.com/repository/maven"; /** * 仓库地址 diff --git a/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/RuntimeEnv.java b/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/RuntimeEnv.java index cb092d6..04e5097 100644 --- a/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/RuntimeEnv.java +++ b/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/RuntimeEnv.java @@ -28,7 +28,7 @@ public class RuntimeEnv { public static final RuntimeEnv ENV = new RuntimeEnv(); private static String defaultLibrary = "libraries"; - private static final String defaultRepositoryCentral = "https://repo.nju.edu.cn/repository/maven-public"; + private static final String defaultRepositoryCentral = "https://mirrors.huaweicloud.com/repository/maven"; public void setup(String dataFolder) { defaultLibrary = dataFolder + "/" + defaultLibrary; diff --git a/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/annotation/RuntimeDependency.java b/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/annotation/RuntimeDependency.java index 64cc6ce..6e229a5 100644 --- a/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/annotation/RuntimeDependency.java +++ b/zmusic-runtime/src/main/java/me/zhenxin/zmusic/dependencies/annotation/RuntimeDependency.java @@ -17,7 +17,7 @@ String test() default ""; - String repository() default "https://repo.nju.edu.cn/repository/maven-public"; + String repository() default "https://mirrors.huaweicloud.com/repository/maven"; boolean transitive() default true;