Update FancyHolograms versioning and dependencies

This commit is contained in:
Oliver
2025-03-14 18:01:23 +01:00
parent a3c75c4022
commit 92be8f419d
3 changed files with 12 additions and 48 deletions

View File

@@ -1,3 +1,5 @@
fancyhologramsVersion=2.4.2
org.gradle.parallel=true org.gradle.parallel=true
org.gradle.caching=true org.gradle.caching=true
org.gradle.configuration-cache=true org.gradle.configuration-cache=true

View File

@@ -46,9 +46,9 @@ tasks {
} }
publications { publications {
create<MavenPublication>("maven") { create<MavenPublication>("maven") {
groupId = rootProject.group.toString() groupId = "de.oliver"
artifactId = rootProject.name artifactId = "fancyholograms"
version = rootProject.version.toString() version = findProperty("fancyhologramsVersion") as String
from(project.components["java"]) from(project.components["java"])
} }
} }

View File

@@ -35,8 +35,7 @@ val supportedVersions =
allprojects { allprojects {
group = "de.oliver" group = "de.oliver"
val buildId = System.getenv("BUILD_ID") version = findProperty("fancyhologramsVersion") as String
version = "2.4.2" + (if (buildId != null) ".$buildId" else "")
description = "Simple, lightweight and fast hologram plugin using display entities" description = "Simple, lightweight and fast hologram plugin using display entities"
repositories { repositories {
@@ -72,7 +71,7 @@ dependencies {
compileOnly("de.oliver:FancyNpcs:2.4.2") compileOnly("de.oliver:FancyNpcs:2.4.2")
compileOnly("org.lushplugins:ChatColorHandler:5.1.2") compileOnly("org.lushplugins:ChatColorHandler:5.1.2")
compileOnly("com.viaversion:viaversion-api:5.2.0") compileOnly("com.viaversion:viaversion-api:5.2.1")
compileOnly("org.geysermc.floodgate:api:2.2.4-SNAPSHOT") compileOnly("org.geysermc.floodgate:api:2.2.4-SNAPSHOT")
} }
@@ -81,7 +80,7 @@ paper {
bootstrapper = "de.oliver.fancyholograms.main.FancyHologramsBootstrapper" bootstrapper = "de.oliver.fancyholograms.main.FancyHologramsBootstrapper"
loader = "de.oliver.fancyholograms.main.FancyHologramsLoader" loader = "de.oliver.fancyholograms.main.FancyHologramsLoader"
foliaSupported = true foliaSupported = true
version = rootProject.version.toString() version = findProperty("fancyhologramsVersion") as String
description = "Simple, lightweight and fast hologram plugin using display entities" description = "Simple, lightweight and fast hologram plugin using display entities"
apiVersion = "1.19" apiVersion = "1.19"
load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
@@ -131,38 +130,6 @@ tasks {
dependsOn(":plugins:fancyholograms:api:shadowJar") dependsOn(":plugins:fancyholograms:api:shadowJar")
} }
publishing {
repositories {
maven {
name = "fancypluginsReleases"
url = uri("https://repo.fancyplugins.de/releases")
credentials(PasswordCredentials::class)
authentication {
isAllowInsecureProtocol = true
create<BasicAuthentication>("basic")
}
}
maven {
name = "fancypluginsSnapshots"
url = uri("https://repo.fancyplugins.de/snapshots")
credentials(PasswordCredentials::class)
authentication {
isAllowInsecureProtocol = true
create<BasicAuthentication>("basic")
}
}
}
publications {
create<MavenPublication>("maven") {
groupId = project.group.toString()
artifactId = project.name
version = project.version.toString()
from(project.components["java"])
}
}
}
compileJava { compileJava {
options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything
options.release = 21 options.release = 21
@@ -170,18 +137,13 @@ tasks {
options.compilerArgs.add("-parameters") options.compilerArgs.add("-parameters")
} }
javadoc {
options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything
}
processResources { processResources {
filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything
val props = mapOf( val props = mapOf(
"description" to project.description, "description" to project.description,
"version" to project.version, "version" to findProperty("fancyhologramsVersion") as String,
"hash" to getCurrentCommitHash(), "hash" to getCurrentCommitHash(),
"build" to (System.getenv("BUILD_ID") ?: "").ifEmpty { "undefined" }
) )
inputs.properties(props) inputs.properties(props)
@@ -218,7 +180,7 @@ fun getLastCommitMessage(): String {
hangarPublish { hangarPublish {
publications.register("plugin") { publications.register("plugin") {
version = project.version as String version = findProperty("fancyhologramsVersion") as String
id = "FancyHolograms" id = "FancyHolograms"
channel = "Alpha" channel = "Alpha"
@@ -238,9 +200,9 @@ hangarPublish {
modrinth { modrinth {
token.set(System.getenv("MODRINTH_PUBLISH_API_TOKEN")) token.set(System.getenv("MODRINTH_PUBLISH_API_TOKEN"))
projectId.set("fancyholograms") projectId.set("fancyholograms")
versionNumber.set(project.version.toString()) versionNumber.set(findProperty("fancyhologramsVersion") as String)
versionType.set("alpha") versionType.set("alpha")
uploadFile.set(file("build/libs/${project.name}-${project.version}.jar")) uploadFile.set(file("build/libs/FancyHolograms-${findProperty("fancyhologramsVersion") as String}.jar"))
gameVersions.addAll(supportedVersions) gameVersions.addAll(supportedVersions)
loaders.add("paper") loaders.add("paper")
loaders.add("folia") loaders.add("folia")