[ci-skip] Apply previous changes

Crazy-Crew · Apr 8, 2023 · 84b9b06 · 84b9b06
1 parent b9fd57c
commit 84b9b06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,14 +18,19 @@ val extension = settings.versions.extension.get()
 val color = if (beta) betaUpdate else releaseUpdate
 val repo = if (beta) "beta" else "releases"
 
-val url = if (beta) "https://ci.crazycrew.us/job/${rootProject.name}/" else "https://modrinth.com/$extension/${rootProject.name.lowercase()}/versions"
 val download = if (beta) "https://ci.crazycrew.us/job/${rootProject.name}/" else "https://modrinth.com/$extension/${rootProject.name.lowercase()}/version/${rootProject.version}"
+
 val msg = if (beta) "New version of ${rootProject.name} is ready!" else "New version of ${rootProject.name} is ready! <@&1029922295210311681>"
 
 val hash = shellRun("git", listOf("rev-parse", "--short", "HEAD"))
 
 rootProject.version = if (beta) hash else "2.9.14.2"
 
+val desc = if (beta) """
+    Changes:
+    » N/A
+""".trimIndent() else "https://modrinth.com/$extension/${rootProject.name.lowercase()}/version/${rootProject.version}"
+
 webhook {
     this.avatar("https://en.gravatar.com/avatar/${WebhookExtension.Gravatar().md5Hex("no-reply@ryderbelserion.com")}.jpeg")
 
@@ -40,7 +45,7 @@ webhook {
             this.fields {
                 this.field(
                     "Download: ",
-                    url
+                    download
                 )
 
                 this.field(
@@ -51,7 +56,7 @@ webhook {
 
             this.author(
                 "${rootProject.name} | Version ${rootProject.version}",
-                url,
+                download,
                 "https://raw.githubusercontent.com/RyderBelserion/assets/main/crazycrew/png/${rootProject.name}Website.png"
             )
         }
@@ -61,10 +66,7 @@ webhook {
 
             this.title("What changed?")
 
-            this.description("""
-                Changes:
-                » N/A
-            """.trimIndent())
+            this.description(desc)
         }
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -44,6 +44,8 @@ kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "
 kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin"}
 kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }
 
+minotaur = { module = "com.modrinth.minotaur:Minotaur", version = "2.7.5" }
+
 shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }
 
 turtle = { module = "com.lordcodes.turtle:turtle", version = "0.8.0" }
diff --git a/platforms/paper/build.gradle.kts b/platforms/paper/build.gradle.kts
@@ -51,7 +51,11 @@ tasks {
 
         versionType.set(type)
 
-        uploadFile.set(reobfJar.get())
+        val file = File("$rootDir/jars")
+
+        if (!file.exists()) file.mkdirs()
+
+        uploadFile.set(layout.buildDirectory.file("$file/${rootProject.name}-Paper-${rootProject.version}.jar"))
 
         autoAddDependsOn.set(true)