diff --git a/ball-bukkit/build.gradle.kts b/ball-bukkit/build.gradle.kts index e71ef3f..e248757 100644 --- a/ball-bukkit/build.gradle.kts +++ b/ball-bukkit/build.gradle.kts @@ -1,22 +1,18 @@ evaluationDependsOn(":ball-common") dependencies { - implementation(project(":ball-common")) { isTransitive = false } + api(project(":ball-common")) { isTransitive = false } + compileOnly("org.spigotmc:spigot-api:+") - compileOnly("org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT") + compileOnly("cn.hamster3.mc.plugin:core-bukkit:+") + compileOnly("me.clip:placeholderapi:+") { isTransitive = false } - val hamsterCoreVersion = property("hamster_core_version") - compileOnly("cn.hamster3.mc.plugin:core-bukkit:${hamsterCoreVersion}") - compileOnly("me.clip:placeholderapi:2.11.2") { isTransitive = false } - - val redissionVersion = property("redission_version") - implementation("org.redisson:redisson:${redissionVersion}") { + implementation("org.redisson:redisson:+") { exclude(group = "io.netty") exclude(group = "org.slf4j") } } - tasks { processResources { filesMatching("plugin.yml") { diff --git a/ball-bungeecord/build.gradle.kts b/ball-bungeecord/build.gradle.kts index 6d00cb5..0681e5d 100644 --- a/ball-bungeecord/build.gradle.kts +++ b/ball-bungeecord/build.gradle.kts @@ -1,25 +1,19 @@ evaluationDependsOn(":ball-common") dependencies { - implementation(project(":ball-common")) { isTransitive = false } + api(project(":ball-common")) { isTransitive = false } + compileOnly("net.md-5:bungeecord-api:+") - compileOnly("net.md-5:bungeecord-api:1.20-R0.1-SNAPSHOT") + compileOnly("cn.hamster3.mc.plugin:core-bungeecord:+") - val hamsterCoreVersion = property("hamster_core_version") - compileOnly("cn.hamster3.mc.plugin:core-bungeecord:${hamsterCoreVersion}") - compileOnly("me.clip:placeholderapi:2.11.2") { isTransitive = false } - - val redissionVersion = property("redission_version") - implementation("org.redisson:redisson:${redissionVersion}") { + implementation("org.redisson:redisson:+") { exclude(group = "io.netty") exclude(group = "org.yaml") exclude(group = "org.slf4j") } - // https://mvnrepository.com/artifact/io.netty/netty-resolver-dns - implementation("io.netty:netty-resolver-dns:4.1.96.Final") + implementation("io.netty:netty-resolver-dns:+") } - tasks { processResources { filesMatching("bungee.yml") { diff --git a/ball-common/build.gradle.kts b/ball-common/build.gradle.kts index 9e0a752..5524fa2 100644 --- a/ball-common/build.gradle.kts +++ b/ball-common/build.gradle.kts @@ -1,17 +1,12 @@ @file:Suppress("VulnerableLibrariesLocal") dependencies { - // https://mvnrepository.com/artifact/com.google.code.gson/gson + compileOnly("cn.hamster3.mc.plugin:core-common:+") + + compileOnly("io.netty:netty-buffer:4+") compileOnly("com.google.code.gson:gson:2.8.0") - // https://mvnrepository.com/artifact/io.netty/netty-buffer - compileOnly("io.netty:netty-buffer:4.1.96.Final") - - val hamsterCoreVersion = property("hamster_core_version") - compileOnly("cn.hamster3.mc.plugin:core-common:${hamsterCoreVersion}") - - val redissionVersion = property("redission_version") - implementation("org.redisson:redisson:${redissionVersion}") { + implementation("org.redisson:redisson:+") { isTransitive = false exclude(group = "io.netty") exclude(group = "org.yaml") diff --git a/build.gradle.kts b/build.gradle.kts index eb38cd2..b79c734 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ version = "1.1.0-SNAPSHOT" subprojects { apply { - plugin("java") + plugin("java-library") plugin("maven-publish") plugin("com.github.johnrengelman.shadow") } @@ -24,40 +24,25 @@ subprojects { } dependencies { - // https://mvnrepository.com/artifact/org.jetbrains/annotations - implementation("org.jetbrains:annotations:24.0.1") - // https://mvnrepository.com/artifact/org.projectlombok/lombok - compileOnly("org.projectlombok:lombok:1.18.28") - annotationProcessor("org.projectlombok:lombok:1.18.28") + implementation("org.jetbrains:annotations:+") + compileOnly("org.projectlombok:lombok:+") + annotationProcessor("org.projectlombok:lombok:+") } java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 -// withJavadocJar() withSourcesJar() } tasks { - withType().configureEach { + withType { options.encoding = "UTF-8" } - withType().configureEach { + withType { from(rootProject.file("LICENSE")) duplicatesStrategy = DuplicatesStrategy.EXCLUDE } - javadoc { - options.jFlags("-Dfile.encoding=utf8") - options.encoding = "UTF-8" - options.quiet() - val o: StandardJavadocDocletOptions = options as StandardJavadocDocletOptions - o.addStringOption("Xdoclint:none", "-quiet") - o.links( - "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0", - "https://javadoc.io/doc/com.google.code.gson/gson/2.8.0", - "https://bukkit.windit.net/javadoc" - ) - } shadowJar { relocate("org.yaml", "cn.hamster3.mc.plugin.ball.lib.org.yaml") destinationDirectory = rootProject.buildDir diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 9c52522..0000000 --- a/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -org.gradle.jvmargs=-Xmx8G -hamster_core_version=1.1.0-SNAPSHOT -redission_version=3.23.2