From d5e8f412d7d9c42e70dc03457f1ea8d5b2b4806a Mon Sep 17 00:00:00 2001
From: ruscalworld <me@ruscal.world>
Date: Tue, 20 Jun 2023 17:34:40 +0300
Subject: [PATCH] Bump version & update publishing

---
 build.gradle      | 24 ++++++++++++------------
 gradle.properties |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index c764d61..c37c280 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,8 @@
-import com.modrinth.minotaur.TaskModrinthUpload
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.2'
-    id 'com.modrinth.minotaur' version '1.1.0'
+    id 'com.modrinth.minotaur' version '2.+'
     id 'fabric-loom' version '0.12-SNAPSHOT'
     id 'maven-publish'
 }
@@ -14,8 +13,6 @@ repositories {
     }
 }
 
-apply plugin: 'com.github.johnrengelman.shadow'
-
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
@@ -92,17 +89,20 @@ tasks.register('remapShadowJar', RemapJarTask) {
     addNestedDependencies = true
 }
 
-assemble.dependsOn(remapShadowJar)
-
-tasks.register('publishModrinth', TaskModrinthUpload) {
-    dependsOn remapShadowJar
-    onlyIf { System.getenv('MODRINTH_TOKEN') }
-
+modrinth {
     token = System.getenv('MODRINTH_TOKEN')
     projectId = 'dbVXHSlv'
     versionNumber = project.mod_version
+    versionType = 'release'
     uploadFile = remapShadowJar
 
-    addGameVersion((String) project.minecraft_version)
-    addLoader('fabric')
+    gameVersions.add(project.minecraft_version)
+    loaders.add('fabric')
+
+    dependencies {
+        required.project 'fabric-api'
+        optional.project 'spark'
+    }
 }
+
+assemble.dependsOn(remapShadowJar)
diff --git a/gradle.properties b/gradle.properties
index 0c4d623..3897f11 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.2
 loader_version=0.14.21
 # Mod Properties
-mod_version=1.0.9
+mod_version=1.0.10
 maven_group=ru.ruscalworld
 archives_base_name=fabricexporter
 # Dependencies