From 8e9bc17c474ffbfdeec5e791bce10d8a4c8690b0 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Sat, 3 Dec 2022 16:45:52 +0100
Subject: [PATCH] Late evaluation for jfmod curseforge/modrinth publish (ensure
 curseforge publish still works!)

---
 jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts | 8 +++-----
 jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts b/jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts
index f770e47..873228d 100644
--- a/jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts
+++ b/jfmod/src/main/kotlin/jfmod.curseforge.gradle.kts
@@ -14,8 +14,9 @@ curseforge {
         addGameVersion("Fabric")
         addGameVersion(lom.minecraftVersion.get())
         changelog = project.changelog
-        mainArtifact(tasks.remapJar.get().archiveFile.get())
-        mainArtifact.displayName = "[${lom.minecraftVersion.get()}] $versionS"
+        mainArtifact(tasks.remapJar) {
+            displayName = "[${lom.minecraftVersion.get()}] $versionS"
+        }
         relations {
             prop("curseforge_required_dependencies", "")
                 .split(", ", ",")
@@ -26,9 +27,6 @@ curseforge {
                 .filter { it.isNotBlank() }
                 .forEach { optionalDependency(it) }
         }
-        afterEvaluate {
-            uploadTask.dependsOn(tasks.build.get())
-        }
     }
     options {
         forgeGradleIntegration = false
diff --git a/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts b/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts
index ecc8382..b793d13 100644
--- a/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts
+++ b/jfmod/src/main/kotlin/jfmod.modrinth.gradle.kts
@@ -13,7 +13,7 @@ modrinth {
     versionName.set("[${lom.minecraftVersion.get()}] $versionS")
     versionType.set(project.versionType.modrinthName)
     changelog.set(project.changelog)
-    uploadFile.set(tasks.remapJar.get())
+    uploadFile.set(tasks.remapJar as Any)
     gameVersions.add(lom.minecraftVersion.get())
     loaders.add("fabric")
     prop("modrinth_required_dependencies", "")