From 53c02fa6548447f44d331681528d262c0fda931b Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Thu, 21 Dec 2023 00:51:23 +0000 Subject: [PATCH 1/3] update build script version to 1702805890 --- build.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 29b2ba602bf..913152a71c5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1702244235 +//version: 1702805890 /* * DO NOT CHANGE THIS FILE! * Also, you may replace this file at any time if there is an update available. @@ -72,6 +72,7 @@ propertyDefaultIfUnset("usesShadowedDependencies", false) propertyDefaultIfUnset("minimizeShadowedDependencies", true) propertyDefaultIfUnset("relocateShadowedDependencies", true) propertyDefaultIfUnset("separateRunDirectories", false) +propertyDefaultIfUnset("versionDisplayFormat", '$MOD_NAME \u2212 $VERSION') propertyDefaultIfUnsetWithEnvVar("modrinthProjectId", "", "MODRINTH_PROJECT_ID") propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnsetWithEnvVar("curseForgeProjectId", "", "CURSEFORGE_PROJECT_ID") @@ -889,7 +890,7 @@ if (cfApiKey.isPresent() || deploymentDebug.toBoolean()) { def changelogFile = getChangelog() def changelogRaw = changelogFile.exists() ? changelogFile.getText('UTF-8') : "" - mainFile.displayName = "${modName}: ${modVersion}" + mainFile.displayName = versionDisplayFormat.replace('$MOD_NAME', modName).replace('$VERSION', modVersion) mainFile.releaseType = getReleaseType() mainFile.changelog = changelogRaw mainFile.changelogType = 'markdown' @@ -929,6 +930,7 @@ if (modrinthApiKey.isPresent() || deploymentDebug.toBoolean()) { modrinth { token = modrinthApiKey.getOrElse('debug_token') projectId = modrinthProjectId + versionName = versionDisplayFormat.replace('$MOD_NAME', modName).replace('$VERSION', modVersion) changelog = changelogFile.exists() ? changelogFile.getText('UTF-8') : "" versionType = getReleaseType() versionNumber = modVersion From 7ee136b84f9ea0d14291b96c07d137ec6b019843 Mon Sep 17 00:00:00 2001 From: alongstringofnumbers Date: Mon, 18 Dec 2023 18:06:46 -0700 Subject: [PATCH 2/3] gradle.properties update --- gradle.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8cc69185de4..22a190f0375 100644 --- a/gradle.properties +++ b/gradle.properties @@ -90,7 +90,9 @@ relocateShadowedDependencies = true # Separate run directories into "run/client" for runClient task, and "run/server" for runServer task. # Useful for debugging a server and client simultaneously. If not enabled, it will be in the standard location "run/" separateRunDirectories = false - +# The display name format of versions published to Curse and Modrinth. $MOD_NAME and $VERSION are available variables. +# Default: $MOD_NAME \u2212 $VERSION. \u2212 is the minus character which looks much better than the hyphen minus on Curse. +versionDisplayFormat=$MOD_NAME \u2212 $VERSION # Publishing to modrinth requires you to set the MODRINTH_API_KEY environment variable to your current modrinth API token. From 56a86a62935ce53cccec698aba1732e60f6eaa89 Mon Sep 17 00:00:00 2001 From: alongstringofnumbers Date: Mon, 18 Dec 2023 20:17:53 -0700 Subject: [PATCH 3/3] Switch back to using colon --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 22a190f0375..2408eee2147 100644 --- a/gradle.properties +++ b/gradle.properties @@ -92,7 +92,7 @@ relocateShadowedDependencies = true separateRunDirectories = false # The display name format of versions published to Curse and Modrinth. $MOD_NAME and $VERSION are available variables. # Default: $MOD_NAME \u2212 $VERSION. \u2212 is the minus character which looks much better than the hyphen minus on Curse. -versionDisplayFormat=$MOD_NAME \u2212 $VERSION +versionDisplayFormat=$MOD_NAME: $VERSION # Publishing to modrinth requires you to set the MODRINTH_API_KEY environment variable to your current modrinth API token.