From 0d628fe408f0b1ef4175ca1097456dc06c716cd2 Mon Sep 17 00:00:00 2001 From: isXander Date: Sat, 19 Oct 2024 19:31:24 +0100 Subject: fix publishing versions --- build.gradle.kts | 9 ++++++++- versions/1.20.1-fabric/gradle.properties | 2 ++ versions/1.20.1-forge/gradle.properties | 2 ++ versions/1.20.4-fabric/gradle.properties | 2 ++ versions/1.20.4-neoforge/gradle.properties | 2 ++ versions/1.20.6-fabric/gradle.properties | 2 ++ versions/1.20.6-neoforge/gradle.properties | 2 ++ versions/1.21-fabric/gradle.properties | 2 ++ versions/1.21-neoforge/gradle.properties | 2 ++ versions/1.21.2-fabric/gradle.properties | 3 +++ 10 files changed, 27 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2d8162d..33d85df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -242,8 +242,13 @@ publishMods { }) modLoaders.add(loader) + fun versionList(prop: String) = findProperty(prop)?.toString() + ?.split(',') + ?.map { it.trim() } + ?: emptyList() + // modrinth and curseforge use different formats for snapshots. this can be expressed globally - val stableMCVersions = listOf(stonecutter.current.version) + val stableMCVersions = versionList("pub.stableMC") val modrinthId: String by project if (modrinthId.isNotBlank() && hasProperty("modrinth.token")) { @@ -251,6 +256,7 @@ publishMods { projectId.set(modrinthId) accessToken.set(findProperty("modrinth.token")?.toString()) minecraftVersions.addAll(stableMCVersions) + minecraftVersions.addAll(versionList("pub.modrinthMC")) requires { slug.set("fabric-api") } } @@ -262,6 +268,7 @@ publishMods { projectId.set(curseforgeId) accessToken.set(findProperty("curseforge.token")?.toString()) minecraftVersions.addAll(stableMCVersions) + minecraftVersions.addAll(versionList("pub.curseforgeMC")) requires { slug.set("fabric-api") } } diff --git a/versions/1.20.1-fabric/gradle.properties b/versions/1.20.1-fabric/gradle.properties index 4bd5fcc..475f609 100644 --- a/versions/1.20.1-fabric/gradle.properties +++ b/versions/1.20.1-fabric/gradle.properties @@ -6,3 +6,5 @@ java.version=17 deps.quiltMappings=23 deps.fabricApi=0.92.0+1.20.1 fmj.mcDep=1.20.1 + +pub.stableMC=1.20.1 diff --git a/versions/1.20.1-forge/gradle.properties b/versions/1.20.1-forge/gradle.properties index 3d24407..3bdc7f0 100644 --- a/versions/1.20.1-forge/gradle.properties +++ b/versions/1.20.1-forge/gradle.properties @@ -10,3 +10,5 @@ modstoml.mcDep=[1.20,1.20.1] modstoml.loaderVersion=[46,) modstoml.forgeId=forge modstoml.forgeConstraint=[46,) + +pub.stableMC=1.20,1.20.1 diff --git a/versions/1.20.4-fabric/gradle.properties b/versions/1.20.4-fabric/gradle.properties index ecf8015..f035e9a 100644 --- a/versions/1.20.4-fabric/gradle.properties +++ b/versions/1.20.4-fabric/gradle.properties @@ -6,3 +6,5 @@ java.version=17 deps.quiltMappings=3 deps.fabricApi=0.96.11+1.20.4 fmj.mcDep=1.20.4 + +pub.stableMC=1.20.4 diff --git a/versions/1.20.4-neoforge/gradle.properties b/versions/1.20.4-neoforge/gradle.properties index 2ed0130..4419b8e 100644 --- a/versions/1.20.4-neoforge/gradle.properties +++ b/versions/1.20.4-neoforge/gradle.properties @@ -10,3 +10,5 @@ modstoml.mcDep=[1.20.4] modstoml.loaderVersion=[1,) modstoml.forgeId=neoforge modstoml.forgeConstraint=[20,) + +pub.stableMC=1.20.4 diff --git a/versions/1.20.6-fabric/gradle.properties b/versions/1.20.6-fabric/gradle.properties index 0061628..8d9454c 100644 --- a/versions/1.20.6-fabric/gradle.properties +++ b/versions/1.20.6-fabric/gradle.properties @@ -6,3 +6,5 @@ java.version=21 deps.quiltMappings= deps.fabricApi=0.99.0+1.20.6 fmj.mcDep=~1.20.5 + +pub.stableMC=1.20.5,1.20.6 diff --git a/versions/1.20.6-neoforge/gradle.properties b/versions/1.20.6-neoforge/gradle.properties index 2e9f1df..af23d60 100644 --- a/versions/1.20.6-neoforge/gradle.properties +++ b/versions/1.20.6-neoforge/gradle.properties @@ -10,3 +10,5 @@ modstoml.mcDep=[1.20.5,1.20.6] modstoml.loaderVersion=[1,) modstoml.forgeId=neoforge modstoml.forgeConstraint=[20,) + +pubs.stableMC=1.20.5,1.20.6 diff --git a/versions/1.21-fabric/gradle.properties b/versions/1.21-fabric/gradle.properties index f67c5e8..018a1a7 100644 --- a/versions/1.21-fabric/gradle.properties +++ b/versions/1.21-fabric/gradle.properties @@ -6,3 +6,5 @@ java.version=21 deps.quiltMappings= deps.fabricApi=0.100.1+1.21 fmj.mcDep=~1.21 <1.21.2 + +pub.stableMC=1.21,1.21.1 diff --git a/versions/1.21-neoforge/gradle.properties b/versions/1.21-neoforge/gradle.properties index cf9b7e8..bf24b11 100644 --- a/versions/1.21-neoforge/gradle.properties +++ b/versions/1.21-neoforge/gradle.properties @@ -10,3 +10,5 @@ modstoml.mcDep=[1.21] modstoml.loaderVersion=[1,) modstoml.forgeId=neoforge modstoml.forgeConstraint=[21,) + +pub.stableMC=1.21,1.21.1 diff --git a/versions/1.21.2-fabric/gradle.properties b/versions/1.21.2-fabric/gradle.properties index ab1a162..2a352d9 100644 --- a/versions/1.21.2-fabric/gradle.properties +++ b/versions/1.21.2-fabric/gradle.properties @@ -6,3 +6,6 @@ java.version=21 deps.quiltMappings= deps.fabricApi=0.106.0+1.21.2 fmj.mcDep=~1.21.2- + +pub.modrinthMC=1.21.2-rc1 +pub.curseforgeMC=1.21.2-Snapshot -- cgit