Actually I am very stupid

CaelTheColher · Feb 14, 2023 · 7734fcd · 7734fcd
1 parent 585c909
commit 7734fcd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,6 +4,7 @@ plugins {
     id "org.ajoberstar.grgit" version "5.0.0" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
     id "com.modrinth.minotaur" version "2.+" apply false
+    id "org.jetbrains.kotlin.jvm" version "1.8.0" apply false
 }
 
 architectury {

diff --git a/common/build.gradle b/common/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "org.jetbrains.kotlin.jvm" version "1.8.0"
+    id "org.jetbrains.kotlin.jvm"
 }
 
 architectury {

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "org.jetbrains.kotlin.jvm" version "1.8.0"
+    id "org.jetbrains.kotlin.jvm"
     id "org.ajoberstar.grgit"
     id "com.matthewprenger.cursegradle"
     id "com.modrinth.minotaur"
@@ -98,16 +98,16 @@ publishing {
 
 def DISPLAY_NAME = "[Fabric ${minecraft_version}] Capes ${mod_version.split('\\+')[0]}"
 
-static String getChangelog() {
-    "A changelog can be found at https://github.com/CaelTheColher/Capes"
+static def getChangeLog() {
+    return "A changelog can be found at https://github.com/CaelTheColher/Capes"
 }
 
 curseforge {
     String token = System.getenv("CURSEFORGE_API_KEY")
     apiKey = token == null || token.isEmpty() ? "unset" : token
     project {
         id = curseforge_id
-        changelog = getChangelog()
+        changelog = getChangeLog()
         releaseType = "release"
         addGameVersion("Fabric")
         addGameVersion(minecraft_version)
@@ -131,11 +131,11 @@ modrinth {
     projectId = modrinth_id
     versionNumber = mod_version
     versionName = DISPLAY_NAME
-    versionType = "release"
-    changelog = getChangelog()
     uploadFile = remapJar
     gameVersions = [minecraft_version]
-    loaders = ["fabric"]
+    loaders = ['fabric']
+    versionType = "release"
+    changelog = getChangeLog()
     dependencies {
         required.project("fabric-api")
         required.project("fabric-language-kotlin")
@@ -174,7 +174,7 @@ tasks.register('github') {
 
         def releaseBuilder = new GHReleaseBuilder(repository, version as String)
         releaseBuilder.name(DISPLAY_NAME)
-        releaseBuilder.body(getChangelog())
+        releaseBuilder.body(getChangeLog())
         releaseBuilder.commitish(getBranch())
 
         def ghRelease = releaseBuilder.create()

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "org.jetbrains.kotlin.jvm" version "1.8.0"
+    id "org.jetbrains.kotlin.jvm"
     id "org.ajoberstar.grgit"
     id "com.matthewprenger.cursegradle"
     id "com.modrinth.minotaur"
@@ -118,8 +118,8 @@ publishing {
 
 def DISPLAY_NAME = "[Forge ${minecraft_version}] Capes ${mod_version.split('\\+')[0]}"
 
-static String getChangelog() {
-    "A changelog can be found at https://github.com/CaelTheColher/Capes"
+static def getChangeLog() {
+    return "A changelog can be found at https://github.com/CaelTheColher/Capes"
 }
 
 curseforge {
@@ -128,7 +128,7 @@ curseforge {
     String gameVersion = minecraft_version
     project {
         id = curseforge_id
-        changelog = getChangelog()
+        changelog = getChangeLog()
         releaseType = "beta"
         addGameVersion("Forge")
         addGameVersion(gameVersion)
@@ -150,11 +150,11 @@ modrinth {
     projectId = modrinth_id
     versionNumber = mod_version
     versionName = DISPLAY_NAME
-    versionType = "release"
-    changelog = getChangelog()
     uploadFile = remapJar
     gameVersions = [minecraft_version]
-    loaders = ["forge"]
+    loaders = ['forge']
+    versionType = "release"
+    changelog = getChangeLog()
     dependencies {
         required.project("kotlin-for-forge")
     }
@@ -191,7 +191,7 @@ tasks.register('github') {
 
         def releaseBuilder = new GHReleaseBuilder(repository, version as String)
         releaseBuilder.name(DISPLAY_NAME)
-        releaseBuilder.body(getChangelog())
+        releaseBuilder.body(getChangeLog())
         releaseBuilder.commitish(getBranch())
 
         def ghRelease = releaseBuilder.create()