Gradle things

GenerationsMod · Nov 25, 2023 · ed75704 · ed75704
1 parent 5ca77bf
commit ed75704
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI
 
 plugins {
     id("architectury-plugin") version "3.4-SNAPSHOT"
-    kotlin("jvm") version ("1.9.20")
+    kotlin("jvm") version ("1.9.21")
     id("dev.architectury.loom") version "1.4-SNAPSHOT" apply false
     idea
     java

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -61,7 +61,7 @@ dependencies {
 
     //Cobblemon
     modApi("com.cobblemon:fabric:${project.properties["cobblemon_version"]}")
-    modApi("net.fabricmc:fabric-language-kotlin:1.10.13+kotlin.1.9.20")
+    modApi("net.fabricmc:fabric-language-kotlin:1.10.14+kotlin.1.9.20")
     modRuntimeOnly("com.jozufozu.flywheel:flywheel-fabric-$minecraftVersion:${project.properties["flywheel_fabric_version"]}")
 }
 
@@ -81,8 +81,11 @@ tasks {
     }
 
     shadowJar {
-        exclude("generations/gg/generations/core/generationscore/fabric/datagen/**",
-            "data/forge/**")
+        exclude(mutableListOf(
+            "generations/gg/generations/core/generationscore/fabric/datagen/**",
+            "data/forge/**",
+            "architectury.common.json"
+        ))
         configurations = listOf(project.configurations.getByName("shadowCommon"))
         archiveClassifier.set("dev-shadow")
     }
@@ -110,7 +113,7 @@ components {
 }
 
 publishing {
-    publications.create<MavenPublication>("mavenCommon") {
+    publications.create<MavenPublication>("mavenFabric") {
         artifactId = "${project.properties["archives_base_name"]}" + "-Fabric"
         from(components["java"])
     }

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -24,8 +24,8 @@ loom {
         convertAccessWideners.set(true)
         extraAccessWideners.add(loom.accessWidenerPath.get().asFile.name)
 
-        mixinConfig("GenerationsCore-common.mixins.json")
-        mixinConfig("GenerationsCore.mixins.json")
+        mixinConfigs("GenerationsCore-common.mixins.json",
+            "GenerationsCore.mixins.json")
     }
 
     runs.create("data") {
@@ -64,7 +64,7 @@ dependencies {
     modRuntimeOnly("lol.bai:badpackets:forge-${project.properties["badPackets"]}")
 
     //Cobblemon
-    modRuntimeOnly("thedarkcolour:kotlinforforge:4.5.0")
+    modRuntimeOnly("thedarkcolour:kotlinforforge:4.7.0")
     modApi("com.cobblemon:forge:${project.properties["cobblemon_version"]}")
 }
 
@@ -80,7 +80,8 @@ tasks {
 
     shadowJar {
         exclude("fabric.mod.json",
-            "generations/gg/generations/core/generationscore/forge/datagen/**")
+            "generations/gg/generations/core/generationscore/forge/datagen/**",
+            "architectury.common.json")
         configurations = listOf(project.configurations.getByName("shadowCommon"))
         archiveClassifier.set("dev-shadow")
     }
@@ -107,7 +108,7 @@ components {
 }
 
 publishing {
-    publications.create<MavenPublication>("mavenCommon") {
+    publications.create<MavenPublication>("mavenForge") {
         artifactId = "${project.properties["archives_base_name"]}" + "-Forge"
         from(components["java"])
     }