Username404-59
/
SnowyGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update kotlinforforge to 1.12.1 and remove the shadowed kotlinx-serialization library

This commit is contained in:
Username404 2021-05-30 11:23:25 +02:00
parent b28c8180b8
commit 36e30d2a29
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -104,8 +104,6 @@ subprojects {
// Required for discord-rpc // Required for discord-rpc
keepclassmembers("class $group.drpc.** { public * ; }") keepclassmembers("class $group.drpc.** { public * ; }")
dontwarn("kotlinx.serialization.**")
doFirst { doFirst {
libraryjars(configurations.compileClasspath.get().filterNot { file -> libraryjars(configurations.compileClasspath.get().filterNot { file ->
shadowC.contains(file) shadowC.contains(file)

2
forge/build.gradle.kts
View File

@ -3,14 +3,12 @@ repositories {
maven(url = "https://thedarkcolour.github.io/KotlinForForge/") maven(url = "https://thedarkcolour.github.io/KotlinForForge/")
} }
val serializationVer: String by rootProject
dependencies { dependencies {
forge("net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.property("forge_version")}.+") forge("net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.property("forge_version")}.+")
implementation("thedarkcolour:kotlinforforge:${rootProject.property("kotlinforforge")}") implementation("thedarkcolour:kotlinforforge:${rootProject.property("kotlinforforge")}")
modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.property("clothconfig_version")}") modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.property("clothconfig_version")}")
implementation(project(path = ":common")) { isTransitive = false } implementation(project(path = ":common")) { isTransitive = false }
add("developmentForge", project(path = ":common")) { isTransitive = false } add("developmentForge", project(path = ":common")) { isTransitive = false }
shadowC("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVer") { isTransitive = false } // Needed for kotlinx-datetime
shadowC(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false } shadowC(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false }
}; loom { }; loom {
useFabricMixin = true useFabricMixin = true

2
gradle.properties
View File

@ -9,7 +9,7 @@ org.gradle.vfs.watch=true
minecraft=1.16.5 minecraft=1.16.5
forge_version=36.1 forge_version=36.1
kotlinforforge=1.12.0 kotlinforforge=1.12.1
kotlinVer=1.5.0 kotlinVer=1.5.0
serializationVer=1.2.1 serializationVer=1.2.1
fabric_loader_version=0.11.3 fabric_loader_version=0.11.3