Skip to content

Drop minor versions and improve/update build gradle #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TheMeinerLP wants to merge 5 commits into from
Closed

Drop minor versions and improve/update build gradle #63

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
760e8d5
Drop minor versions and improve build gradle
TheMeinerLP Jul 5, 2024
a00c586
Merge branch 'develop' into feature/drop-bukkit-support
OneLiteFeather May 30, 2025
04010ba
Merge branch 'develop' into feature/drop-bukkit-support
OneLiteFeather Aug 17, 2025
8e9c905
Update gradle and fix building
OneLiteFeather Aug 17, 2025
6c548b1
Remove commented-out git command execution in runGitCommand function
OneLiteFeather Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 8 additions & 33 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
alias(libs.plugins.publishdata)
alias(libs.plugins.shadow)
alias(libs.plugins.paper.run)
alias(libs.plugins.bukkit.yml)
alias(libs.plugins.paper.yml)
alias(libs.plugins.hangar)
alias(libs.plugins.modrinth)
id("olf.build-logic")
Expand All @@ -27,15 +27,9 @@ if (!File("$rootDir/.git").exists()) {
group = "net.onelitefeather"
version = "1.4.0"

val minecraftVersion = "1.20.6"
val supportedMinecraftVersions = listOf(
"1.20",
"1.20.1",
"1.20.2",
"1.20.3",
"1.20.4",
"1.20.5",
"1.20.6",
"1.21"
)

repositories {
Expand All @@ -44,29 +38,23 @@ repositories {
}

dependencies {
compileOnly("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT")
implementation("net.kyori:adventure-text-minimessage:4.17.0")
implementation("com.github.zafarkhaja:java-semver:0.10.2")
compileOnly(libs.paper)
implementation(libs.adventure.minimessage)

// testing
testImplementation(kotlin("test"))
testImplementation("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT")
testImplementation("com.github.seeseemelk:MockBukkit-v1.19:3.1.0")
testImplementation("io.mockk:mockk:1.13.11")
testImplementation(libs.paper)
testImplementation(libs.mock.bukkit)
testImplementation(libs.mockk)
}

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
sourceSets.all {
languageSettings {
languageVersion = "2.0"
}
}
}

bukkit {
paper {
main = "dev.themeinerlp.attollo.Attollo"
apiVersion = "1.20"
authors = listOf("TheMeinerLP")
Expand All @@ -82,11 +70,6 @@ bukkit {
default = Default.OP
}
}
commands {
register("attollo") {
permission = "attollo.command.attollo"
}
}
}

publishData {
Expand Down Expand Up @@ -120,13 +103,6 @@ tasks {
pluginJars(rootProject.tasks.shadowJar.map { it.archiveFile }.get())
}
}
register<RunServer>("runFolia") {
downloadsApiService.set(xyz.jpenilla.runtask.service.DownloadsAPIService.folia(project))
minecraftVersion(minecraftVersion)
group = "run paper"
runDirectory.set(file("run-folia"))
jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
}
}

val branch = rootProject.branchName()
Expand Down Expand Up @@ -169,7 +145,6 @@ if (!isRelease || isMainBranch) { // Only publish releases from the main branch
uploadFile.set(tasks.shadowJar.flatMap { it.archiveFile })
gameVersions.addAll(supportedMinecraftVersions)
loaders.add("paper")
loaders.add("bukkit")
}
}

Expand Down
11 changes: 10 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,20 @@ dependencyResolutionManagement {
version("bukkit.yml", "0.6.0")
version("paper.run", "2.3.1")
version("shadow", "8.1.7")
version("paper", "1.21-R0.1-SNAPSHOT")
version("adventure", "4.17.0")
version("mockk", "1.13.11")
version("mock.bukkit", "3.9.0")

library("paper", "io.papermc.paper", "paper-api").versionRef("paper")
library("adventure.minimessage", "net.kyori", "adventure-text-minimessage").versionRef("adventure")
library("mockk", "io.mockk", "mockk").versionRef("mockk")
library("mock.bukkit", "com.github.seeseemelk", "MockBukkit-v1.20").versionRef("mock.bukkit")

plugin("publishdata","de.chojo.publishdata").versionRef("publishdata")
plugin("modrinth", "com.modrinth.minotaur").versionRef("modrinth")
plugin("hangar", "io.papermc.hangar-publish-plugin").versionRef("hangar")
plugin("bukkit.yml", "net.minecrell.plugin-yml.bukkit").versionRef("bukkit.yml")
plugin("paper.yml", "net.minecrell.plugin-yml.paper").versionRef("paper.yml")
plugin("paper.run", "xyz.jpenilla.run-paper").versionRef("paper.run")
plugin("shadow", "io.github.goooler.shadow").versionRef("shadow")
}
Expand Down
Loading