From 85030718c87dcb6c4e6ec48097869d6b0b8743ea Mon Sep 17 00:00:00 2001
From: Niklas Widmann <nik@somethingcatchy.net>
Date: Sat, 3 Jun 2023 11:14:05 +0200
Subject: [PATCH] update CI

---
 .github/workflows/release.yml |  9 ++++-----
 build.gradle.kts              | 10 ++--------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8337cef..0bcb44d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,14 +37,13 @@ jobs:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
           CHANGELOG: ${{ github.event.release.body }}
+          CI: true
 
       - name: Upload to github releases
         if: ${{ github.event_name == 'release' }}
-        uses: actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: svenstaro/upload-release-action@v2
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: build/libs/sliceanddice-forge-${{ github.event.release.tag_name }}.jar
+          file: build/libs/sliceanddice-forge-${{ github.event.release.tag_name }}.jar
           asset_name: sliceanddice-forge-${{ github.event.release.tag_name }}.jar
+          upload_url: ${{ github.event.release.upload_url }}
           asset_content_type: application/java-archive
diff --git a/build.gradle.kts b/build.gradle.kts
index 64e05c0..e34cc4a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,4 @@
-import com.modrinth.minotaur.TaskModrinthSyncBody
+
 import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import org.spongepowered.asm.gradle.plugins.MixinExtension
 import java.time.LocalDateTime
@@ -68,7 +68,6 @@ base {
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
-        languageVersion.set(JavaLanguageVersion.of(17))
     }
     withSourcesJar()
     withJavadocJar()
@@ -224,7 +223,7 @@ tasks.withType<Jar> {
     }
 }
 
-tasks.jar {
+tasks.withType<Jar> {
     finalizedBy("reobfJar")
 }
 
@@ -300,7 +299,6 @@ env["MODRINTH_TOKEN"]?.let { modrinthToken ->
         loaders.set(listOf("forge"))
         versionType.set(release_type)
         uploadFile.set(tasks.jar.get())
-        syncBodyFrom.set(project.file("README.md").readText())
         dependencies {
             required.project("ordsPcFz")
             required.project("LNytGWDc")
@@ -309,10 +307,6 @@ env["MODRINTH_TOKEN"]?.let { modrinthToken ->
     }
 }
 
-tasks.named("modrinth") {
-    dependsOn(tasks.withType<TaskModrinthSyncBody>())
-}
-
 sonarqube {
     properties {
         property("sonar.projectVersion", mod_version)