From 92c24081e288e18c189cfc2a95cf19289c691ef9 Mon Sep 17 00:00:00 2001 From: KrLite <68179735+KrLite@users.noreply.github.com> Date: Thu, 18 Jul 2024 07:35:19 +0800 Subject: [PATCH] 2.1.1 --- CHANGELOG.md | 10 ++-------- build.gradle.kts | 16 +++------------- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7997347..653c664 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,3 @@ -### Changes +### Maintenance Update -- Unified publishing using **modpublisher.** -- Jar name migrate: `{id}-{mcversion}-{modversion}` -> `{id}-{modversion}-{loader}{mcversion}`. -- Tag name migrate: `{id}-{modversion}-mc{mcversion}` -> `{id}-{modversion}-{loader}{mcversion}`. - -### Ownership Transfer - -- **Transferred** ownership to **[Kessoku Tea Time.](https://github.com/KessokuTeaTime)** +- **Use** fully semantic versioning. diff --git a/build.gradle.kts b/build.gradle.kts index 8443d0b..129df0b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,3 @@ -class Display { - lateinit var name: String - lateinit var loader: String - lateinit var version: String -} - -var display: Display = Display() - plugins { base java @@ -15,13 +7,11 @@ plugins { alias(libs.plugins.modpublisher) } +val display = libs.versions.display + group = libs.versions.maven.group.get() version = "${libs.versions.mod.get()}-${libs.versions.loader.get()}${libs.versions.minecraft.get()}" -display.name = libs.versions.display.name.get() -display.loader = libs.versions.display.loader.get() -display.version = libs.versions.display.version.get() - base { archivesName.set(libs.versions.archives.name) } @@ -86,7 +76,7 @@ publisher { curseDepends.optional() curseDepends.embedded() - displayName.set("${display.name} ${libs.versions.mod.get()} for ${display.loader} ${display.version}") + displayName.set("${display.name.get()} ${libs.versions.mod.get()} for ${display.loader.get()} ${display.version.get()}") artifact.set(tasks.remapJar) addAdditionalFile(tasks.remapSourcesJar) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0c18c69..4a58ea8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] maven-group = "band.kessokuteatime" archives-name = "flash" -mod = "2.1.0" +mod = "2.1.1" loader = "fabric" minecraft = "1.20" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c30b486..20db9ad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f21fa56..ad6aa44 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,7 +3,7 @@ "id": "flash", "version": "${version}", - "name": "${display.name}", + "name": "${display.name.get()}", "description": "Flashes as you take a screenshot.", "authors": [ "KessokuTeaTime",