From b2826124a2063cb0cb6eec670573c60e01a6c0d4 Mon Sep 17 00:00:00 2001 From: Archy-X <63976867+Archy-X@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:39:52 -0700 Subject: [PATCH] 2.2.1 Release --- Changelog.md | 6 +++ bukkit/build.gradle.kts | 115 +++++++++++++++++++++++++++------------- gradle.properties | 3 +- 3 files changed, 85 insertions(+), 39 deletions(-) diff --git a/Changelog.md b/Changelog.md index ed8f56053..0cdc65b4e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ Changelog for versions since 2.0.0. +## 2.2.1 + +### Bug Fixes +- Fix cannot measure distance error in PositionHandler +- Fix logs table not being created + ## 2.2.0 ### New Features diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts index 5b6a409c5..b8cec9020 100644 --- a/bukkit/build.gradle.kts +++ b/bukkit/build.gradle.kts @@ -4,8 +4,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { `java-library` id("com.github.johnrengelman.shadow") version "7.1.2" + id("io.papermc.hangar-publish-plugin") version "0.1.2" } +java.sourceCompatibility = JavaVersion.VERSION_17 + repositories { mavenCentral() mavenLocal() @@ -51,57 +54,93 @@ dependencies { compileOnly("io.th0rgal:oraxen:1.173.0") } -tasks.withType { - val projectVersion: String by project - archiveFileName.set("AuraSkills-${projectVersion}.jar") - - relocate("co.aikar.commands", "dev.aurelium.auraskills.acf") - relocate("co.aikar.locales", "dev.aurelium.auraskills.locales") - relocate("de.tr7zw.changeme.nbtapi", "dev.aurelium.auraskills.nbtapi") - relocate("org.bstats", "dev.aurelium.auraskills.bstats") - relocate("com.ezylang.evalex", "dev.aurelium.auraskills.evalex") - relocate("net.kyori", "dev.aurelium.auraskills.kyori") - relocate("com.zaxxer.hikari", "dev.aurelium.auraskills.hikari") - relocate("dev.aurelium.slate", "dev.aurelium.auraskills.slate") - relocate("org.spongepowered.configurate", "dev.aurelium.auraskills.configurate") - relocate("io.leangen.geantyref", "dev.aurelium.auraskills.geantyref") - relocate("net.querz", "dev.aurelium.auraskills.querz") - relocate("com.archyx.polyglot", "dev.aurelium.auraskills.polyglot") - relocate("org.atteo.evo.inflector", "dev.aurelium.auraskills.inflector") - - exclude("acf-*.properties") - - finalizedBy("copyJar") -} +tasks { + withType { + val projectVersion: String by project + archiveFileName.set("AuraSkills-${projectVersion}.jar") -java.sourceCompatibility = JavaVersion.VERSION_17 + relocate("co.aikar.commands", "dev.aurelium.auraskills.acf") + relocate("co.aikar.locales", "dev.aurelium.auraskills.locales") + relocate("de.tr7zw.changeme.nbtapi", "dev.aurelium.auraskills.nbtapi") + relocate("org.bstats", "dev.aurelium.auraskills.bstats") + relocate("com.ezylang.evalex", "dev.aurelium.auraskills.evalex") + relocate("net.kyori", "dev.aurelium.auraskills.kyori") + relocate("com.zaxxer.hikari", "dev.aurelium.auraskills.hikari") + relocate("dev.aurelium.slate", "dev.aurelium.auraskills.slate") + relocate("org.spongepowered.configurate", "dev.aurelium.auraskills.configurate") + relocate("io.leangen.geantyref", "dev.aurelium.auraskills.geantyref") + relocate("net.querz", "dev.aurelium.auraskills.querz") + relocate("com.archyx.polyglot", "dev.aurelium.auraskills.polyglot") + relocate("org.atteo.evo.inflector", "dev.aurelium.auraskills.inflector") -tasks.register("copyJar") { - val projectVersion : String by project - from("build/libs/AuraSkills-${projectVersion}.jar") - into("../build/libs") -} + exclude("acf-*.properties") + + finalizedBy("copyJar") + } + + register("copyJar") { + val projectVersion : String by project + from("build/libs/AuraSkills-${projectVersion}.jar") + into("../build/libs") + } -tasks { build { dependsOn(shadowJar) } + javadoc { options { (this as CoreJavadocOptions).addStringOption("Xdoclint:none", "-quiet") } } -} -tasks.withType { - options.encoding = "UTF-8" - options.compilerArgs.add("-parameters") - options.isFork = true - options.forkOptions.executable = "javac" + withType { + options.encoding = "UTF-8" + options.compilerArgs.add("-parameters") + options.isFork = true + options.forkOptions.executable = "javac" + } + + processResources { + filesMatching("plugin.yml") { + expand("projectVersion" to project.version) + } + } } -tasks.processResources { - filesMatching("plugin.yml") { - expand("projectVersion" to project.version) +val supportedVersions = (project.property("supportedMCVersions") as String).split(",").map { it.trim() } + +if (project.hasProperty("hangarApiKey")) { + hangarPublish { + publications.register("AuraSkills") { + val projectVersion = project.version as String + + version.set(projectVersion) + id.set("AuraSkills") + channel.set("Release") + changelog.set(extractChangelog(projectVersion)) + + apiKey.set(project.property("hangarApiKey") as String) + + platforms { + paper { + jar.set(tasks.shadowJar.flatMap { it.archiveFile }) + platformVersions.set(supportedVersions) + } + } + } } } + +fun extractChangelog(version: String): String { + val heading = Regex.escape(version) + val path = if (System.getProperty("user.dir").endsWith("bukkit")) "../Changelog.md" else "Changelog.md" + + val fullChangelog = File(path).readText() + val headingPattern = Regex("## $heading\\R+([\\s\\S]*?)\\R+##\\s", RegexOption.DOT_MATCHES_ALL) + val result = headingPattern.find(fullChangelog) + + return result?.groupValues?.get(1)?.trim() + ?: throw IllegalArgumentException("Failed to extract changelog section for version $version") +} + diff --git a/gradle.properties b/gradle.properties index c165e9db0..3f9fce753 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ -projectVersion = 2.2.0 \ No newline at end of file +projectVersion=2.2.1 +supportedMCVersions=1.17,1.17.1,1.18,1.18.1,1.18.2,1.19,1.19.1,1.19.2,1.19.3,1.19.4,1.20,1.20.1,1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,1.21