diff --git a/build.gradle.kts b/build.gradle.kts index 4966cac..f98e954 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -104,8 +104,6 @@ subprojects { // Required for discord-rpc keepclassmembers("class $group.drpc.** { public * ; }") - dontwarn("kotlinx.serialization.**") - doFirst { libraryjars(configurations.compileClasspath.get().filterNot { file -> shadowC.contains(file) diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index 13811f9..d49d9f6 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -3,14 +3,12 @@ repositories { maven(url = "https://thedarkcolour.github.io/KotlinForForge/") } -val serializationVer: String by rootProject dependencies { forge("net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.property("forge_version")}.+") implementation("thedarkcolour:kotlinforforge:${rootProject.property("kotlinforforge")}") modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.property("clothconfig_version")}") implementation(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 } }; loom { useFabricMixin = true diff --git a/gradle.properties b/gradle.properties index 328a478..8a2178c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.vfs.watch=true minecraft=1.16.5 forge_version=36.1 -kotlinforforge=1.12.0 +kotlinforforge=1.12.1 kotlinVer=1.5.0 serializationVer=1.2.1 fabric_loader_version=0.11.3