From 6beabf4ec4810668ceebf6a3250874850b733100 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Fri, 9 Aug 2024 04:14:35 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E4=BC=98=E5=8C=96=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 10 +++++----- core-bukkit/build.gradle.kts | 10 ++-------- core-bungee/build.gradle.kts | 8 +------- core-common/build.gradle.kts | 5 +---- core-velocity/build.gradle.kts | 9 ++------- 5 files changed, 11 insertions(+), 31 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cd64bc6..7774ec3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,6 +38,11 @@ subprojects { } tasks { + processResources { + filesMatching("update.yml") { + expand(rootProject.properties) + } + } withType { options.encoding = "UTF-8" } @@ -45,11 +50,6 @@ subprojects { from(rootProject.file("LICENSE")) duplicatesStrategy = DuplicatesStrategy.EXCLUDE } - processResources { - filesMatching("update.yml") { - expand(rootProject.properties) - } - } build { dependsOn(shadowJar) } diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts index b26b17c..67949ac 100644 --- a/core-bukkit/build.gradle.kts +++ b/core-bukkit/build.gradle.kts @@ -19,21 +19,15 @@ dependencies { exclude(group = "org.jetbrains") } // https://mvnrepository.com/artifact/redis.clients/jedis - api("redis.clients:jedis:5.1.2") { + api("redis.clients:jedis:5.1.4") { exclude(group = "com.google.code.gson") exclude(group = "org.slf4j") } - // https://mvnrepository.com/artifact/org.quartz-scheduler/quartz - api("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } - // https://mvnrepository.com/artifact/com.sun.mail/jakarta.mail - api("com.sun.mail:jakarta.mail:2.0.1") // https://www.spigotmc.org/resources/nbt-api.7939/ - implementation("de.tr7zw:item-nbt-api:+") + implementation("de.tr7zw:item-nbt-api:2.13.1") // https://mvnrepository.com/artifact/com.zaxxer/HikariCP implementation("com.zaxxer:HikariCP:4.0.3") { exclude(group = "org.slf4j") } - // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib-jdk8 - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23") { exclude(group = "org.jetbrains") } } tasks { diff --git a/core-bungee/build.gradle.kts b/core-bungee/build.gradle.kts index a1d582c..c6d5a2f 100644 --- a/core-bungee/build.gradle.kts +++ b/core-bungee/build.gradle.kts @@ -15,18 +15,12 @@ dependencies { exclude(group = "org.jetbrains") } // https://mvnrepository.com/artifact/redis.clients/jedis - api("redis.clients:jedis:5.1.2") { + api("redis.clients:jedis:5.1.4") { exclude(group = "com.google.code.gson") exclude(group = "org.slf4j") } - // https://mvnrepository.com/artifact/org.quartz-scheduler/quartz - api("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } - // https://mvnrepository.com/artifact/com.sun.mail/jakarta.mail - api("com.sun.mail:jakarta.mail:2.0.1") implementation("com.zaxxer:HikariCP:4.0.3") { exclude(group = "org.slf4j") } - // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib-jdk8 - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23") { exclude(group = "org.jetbrains") } } tasks { diff --git a/core-common/build.gradle.kts b/core-common/build.gradle.kts index 79b5365..c605abc 100644 --- a/core-common/build.gradle.kts +++ b/core-common/build.gradle.kts @@ -18,13 +18,10 @@ dependencies { } // https://mvnrepository.com/artifact/redis.clients/jedis - compileOnlyApi("redis.clients:jedis:5.1.2") { + compileOnlyApi("redis.clients:jedis:5.1.4") { exclude(group = "com.google.code.gson") exclude(group = "org.slf4j") } - compileOnlyApi("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } - // https://mvnrepository.com/artifact/com.sun.mail/jakarta.mail - compileOnlyApi("com.sun.mail:jakarta.mail:2.0.1") // https://mvnrepository.com/artifact/com.zaxxer/HikariCP compileOnly("com.zaxxer:HikariCP:4.0.3") { isTransitive = false } diff --git a/core-velocity/build.gradle.kts b/core-velocity/build.gradle.kts index c25c43e..b63587b 100644 --- a/core-velocity/build.gradle.kts +++ b/core-velocity/build.gradle.kts @@ -8,23 +8,18 @@ dependencies { annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT") compileOnlyApi("net.kyori:adventure-platform-api:4.3.2") { isTransitive = false } + // https://mvnrepository.com/artifact/redis.clients/jedis - api("redis.clients:jedis:5.1.2") { + api("redis.clients:jedis:5.1.4") { exclude(group = "com.google.code.gson") exclude(group = "org.slf4j") } - // https://mvnrepository.com/artifact/org.quartz-scheduler/quartz - api("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } - // https://mvnrepository.com/artifact/com.sun.mail/jakarta.mail - api("com.sun.mail:jakarta.mail:2.0.1") // https://mvnrepository.com/artifact/com.zaxxer/HikariCP implementation("com.zaxxer:HikariCP:5.1.0") { isTransitive = false } // https://mvnrepository.com/artifact/com.mysql/mysql-connector-j runtimeOnly("com.mysql:mysql-connector-j:8.3.0") - // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib - runtimeOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.23") { exclude(group = "org.jetbrains") } } sourceSets.create("templates") {