Fix build

jaredlll08 · Dec 23, 2023 · 3b3cb7e · 3b3cb7e
1 parent 6e6e62d
commit 3b3cb7e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/DefaultPlugin.kt b/buildSrc/src/main/kotlin/com/blamejared/searchables/gradle/DefaultPlugin.kt
@@ -100,7 +100,6 @@ class DefaultPlugin : Plugin<Project> {
                 }
             }
 
-            @Suppress("UnstableApiUsage")
             withType<ProcessResources> {
                 val properties = mapOf(
                         "version" to project.version,

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -37,7 +37,7 @@ tasks.create<TaskPublishCurseForge>("publishCurseForge") {
     dependsOn(tasks.remapJar)
     apiToken = GMUtils.locateProperty(project, "curseforgeApiToken")
 
-    val mainFile = upload(Properties.CURSE_PROJECT_ID, file("${project.layout.buildDirectory}/libs/${base.archivesName.get()}-$version.jar"))
+    val mainFile = upload(Properties.CURSE_PROJECT_ID, tasks.remapJar.get().archiveFile)
     mainFile.changelogType = "markdown"
     mainFile.changelog = GMUtils.smallChangelog(project, Properties.GIT_REPO)
     mainFile.releaseType = CFG_Constants.RELEASE_TYPE_RELEASE

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -47,7 +47,7 @@ tasks.create<TaskPublishCurseForge>("publishCurseForge") {
     dependsOn(tasks.jar)
     apiToken = GMUtils.locateProperty(project, "curseforgeApiToken") ?: 0
 
-    val mainFile = upload(Properties.CURSE_PROJECT_ID, file("${project.layout.buildDirectory}/libs/${base.archivesName.get()}-$version.jar"))
+    val mainFile = upload(Properties.CURSE_PROJECT_ID, tasks.jar.get().archiveFile)
     mainFile.changelogType = "markdown"
     mainFile.changelog = GMUtils.smallChangelog(project, Properties.GIT_REPO)
     mainFile.releaseType = CFG_Constants.RELEASE_TYPE_RELEASE

diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
@@ -28,7 +28,7 @@ tasks.create<TaskPublishCurseForge>("publishCurseForge") {
     dependsOn(tasks.jar)
     apiToken = GMUtils.locateProperty(project, "curseforgeApiToken") ?: 0
 
-    val mainFile = upload(Properties.CURSE_PROJECT_ID, file("${project.layout.buildDirectory}/libs/${base.archivesName.get()}-$version.jar"))
+    val mainFile = upload(Properties.CURSE_PROJECT_ID, tasks.jar.get().archiveFile)
     mainFile.changelogType = "markdown"
     mainFile.changelog = GMUtils.smallChangelog(project, Properties.GIT_REPO)
     mainFile.releaseType = Constants.RELEASE_TYPE_RELEASE