switch to kotlin dsl & fix build on gradle 9

This commit is contained in:
Colbster937
2026-01-02 19:44:41 -06:00
parent b10882c65f
commit 07fa4bc21c
7 changed files with 75 additions and 88 deletions

View File

@@ -28,7 +28,7 @@ jobs:
- name: Build Jar
run: |
gradle wrapper
./gradlew shadowJar
./gradlew clean shadowJar
- name: Publish Jar
uses: actions/upload-artifact@v4

3
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}

View File

@@ -1,86 +0,0 @@
plugins {
id 'java'
id 'eclipse'
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.8'
id 'com.github.johnrengelman.shadow' version '8.1.1'
id("xyz.jpenilla.run-velocity") version "2.3.1"
}
group = 'dev.colbster937'
version = '1.1.3'
description = 'A reimplementation of OriginBlacklist for EaglerXServer'
def targetJavaVersion = 17
repositories {
mavenCentral()
maven {
name = "papermc-repo"
url = "https://repo.papermc.io/repository/maven-public/"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/groups/public/"
}
maven {
name = "spigotmc-repo"
url = "https://hub.spigotmc.org/nexus/content/repositories/public/"
}
maven {
name = "md_5"
url = "https://repo.md-5.net/content/repositories/releases/"
}
maven {
name = "aikar"
url = "https://repo.aikar.co/nexus/content/groups/aikar/"
}
maven {
name = "lax1dude"
url = "https://repo.lax1dude.net/repository/releases/"
}
}
dependencies {
compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT")
annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT")
compileOnly("org.bukkit:bukkit:1.8-R0.1-SNAPSHOT")
compileOnly("net.md-5:bungeecord-api:1.8-SNAPSHOT")
compileOnly("net.lax1dude.eaglercraft.backend:api-velocity:1.0.0")
compileOnly("net.lax1dude.eaglercraft.backend:api-bungee:1.0.0")
compileOnly("net.lax1dude.eaglercraft.backend:api-bukkit:1.0.0")
implementation("org.yaml:snakeyaml:2.2")
implementation("net.kyori:adventure-text-serializer-legacy:4.20.0")
implementation("net.kyori:adventure-text-minimessage:4.20.0")
implementation("com.github.seancfoley:ipaddress:5.3.4")
}
tasks {
runVelocity {
velocityVersion("3.3.0-SNAPSHOT")
}
}
java {
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
}
processResources {
filesMatching(['plugin.yml', 'bungee.yml', 'velocity-plugin.json', 'Base.java']) {
expand(
version: project.version,
description: project.description
)
}
}
shadowJar {
relocate 'org.yaml.snakeyaml', 'dev.colbster937.shaded.snakeyaml'
relocate 'inet.ipaddr', 'dev.colbster937.shaded.ipaddr'
archiveVersion.set('')
archiveClassifier.set('')
}
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
options.release.set(targetJavaVersion)
}

70
build.gradle.kts Normal file
View File

@@ -0,0 +1,70 @@
plugins {
id("java")
id("eclipse")
id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.8"
id("com.gradleup.shadow") version "9.3.0"
id("xyz.jpenilla.run-velocity") version "2.3.1"
}
group = "dev.colbster937"
version = "1.1.3"
description = "A reimplementation of OriginBlacklist for EaglerXServer"
val targetJavaVersion = 17
repositories {
mavenCentral()
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://oss.sonatype.org/content/groups/public/")
maven("https://hub.spigotmc.org/nexus/content/repositories/public/")
maven("https://repo.md-5.net/content/repositories/releases/")
maven("https://repo.aikar.co/nexus/content/groups/aikar/")
maven("https://repo.lax1dude.net/repository/releases/")
}
dependencies {
compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
compileOnly("org.bukkit:bukkit:1.8-R0.1-SNAPSHOT")
compileOnly("net.md-5:bungeecord-api:1.8-SNAPSHOT")
compileOnly("net.lax1dude.eaglercraft.backend:api-velocity:1.0.0")
compileOnly("net.lax1dude.eaglercraft.backend:api-bungee:1.0.0")
compileOnly("net.lax1dude.eaglercraft.backend:api-bukkit:1.0.0")
implementation("org.yaml:snakeyaml:2.2")
implementation("net.kyori:adventure-text-serializer-legacy:4.20.0")
implementation("net.kyori:adventure-text-minimessage:4.20.0")
implementation("com.github.seancfoley:ipaddress:5.3.4")
}
tasks {
named<xyz.jpenilla.runvelocity.task.RunVelocity>("runVelocity") {
velocityVersion("3.4.0-SNAPSHOT")
}
}
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(targetJavaVersion))
}
tasks.processResources {
filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json", "Base.java")) {
expand(
mapOf(
"version" to project.version,
"description" to project.description
)
)
}
}
tasks.shadowJar {
relocate("org.yaml.snakeyaml", "dev.colbster937.shaded.snakeyaml")
relocate("inet.ipaddr", "dev.colbster937.shaded.ipaddr")
archiveVersion.set("")
archiveClassifier.set("")
}
tasks.withType<JavaCompile>().configureEach {
options.encoding = "UTF-8"
options.release.set(targetJavaVersion)
}

View File

View File

@@ -1 +0,0 @@
rootProject.name = 'OriginBlacklist'

1
settings.gradle.kts Normal file
View File

@@ -0,0 +1 @@
rootProject.name = "OriginBlacklist"