From fb83b1089471fa0f6bf1dda9f10b21b9a58b4835 Mon Sep 17 00:00:00 2001 From: Username404-59 Date: Thu, 5 Feb 2026 20:02:35 +0100 Subject: [PATCH] Update build dependencies for 1.21.11 Signed-off-by: Username404-59 --- build.gradle.kts | 16 ++++++++-------- gradle.properties | 24 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8cf37fb..844c042 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,21 +4,22 @@ import com.modrinth.minotaur.dependencies.DependencyType import masecla.modrinth4j.model.version.ProjectVersion.VersionType import net.fabricmc.loom.LoomGradleExtension import net.fabricmc.loom.api.LoomGradleExtensionAPI +import org.jetbrains.kotlin.gradle.dsl.JvmTarget buildscript { dependencies { - classpath("com.guardsquare:proguard-gradle:[7.5, 7.7[") { + classpath("com.guardsquare:proguard-gradle:[7.8, 7.9[") { exclude("com.android.tools.build") } } } plugins { - kotlin("jvm") version "2.1.20" - kotlin("plugin.serialization") version "2.1.20" + kotlin("jvm") version "2.3.0" + kotlin("plugin.serialization") version "2.3.0" id("com.github.johnrengelman.shadow") version "8.1.1" apply false id("architectury-plugin") version "[3.4.160, 3.5[" - id("dev.architectury.loom") version "1.10-SNAPSHOT" apply false + id("dev.architectury.loom") version "1.13-SNAPSHOT" apply false id("com.github.ben-manes.versions") version "0.51.0" id("net.kyori.indra.git") version "3.1.3" id("org.cqfn.diktat.diktat-gradle-plugin") version "1.2.5" @@ -57,7 +58,7 @@ subprojects { } mappingsDep = layered { silentMojangMappingsLicense() - officialMojangMappings().parchment("org.parchmentmc.data:parchment-1.21.6:2025.06.26-nightly-20250626.125431-1") + officialMojangMappings().parchment("org.parchmentmc.data:parchment-1.21.11:2025.12.20") } val refmap = "snowygui-${project.name}-refmap.json" mixin { @@ -204,7 +205,7 @@ allprojects { } tasks { withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { - with(kotlinOptions) { + compilerOptions { // https://github.com/JetBrains/kotlin/blob/master/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt freeCompilerArgs = listOf( "-Xjvm-default=all", "-Xlambdas=indy", "-Xtype-enhancement-improvements-strict-mode", @@ -212,11 +213,10 @@ allprojects { "-Xbackend-threads=0", "-Xno-param-assertions", "-Xno-call-assertions", "-opt-in=kotlin.RequiresOptIn", "-Xextended-compiler-checks", "-Xassertions=jvm", "-progressive" ) - jvmTarget = javaVer - // Uncomment when updating to architectury-loom 1.9 //languageVersion = (kotlinSplitVersion[0] + '.' + (kotlinSplitVersion[1].toShort() + 1).toString()) //apiVersion = "${kotlinSplitVersion[0]}.${kotlinSplitVersion[1]}" } + compilerOptions.jvmTarget.set(JvmTarget.fromTarget(javaVer)) } withType(JavaCompile::class) { with(options) { diff --git a/gradle.properties b/gradle.properties index a38f704..e6dc801 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,16 +7,16 @@ org.gradle.parallel=true org.gradle.unsafe.configuration-cache=on org.gradle.vfs.watch=true -minecraft=1.21.6 -forge_version=21.6.0-beta -kotlinforforge=5.9.0 -kotlinVer=2.1.20 +minecraft=1.21.11 +forge_version=21.11.38-beta +kotlinforforge=6.1.0 +kotlinVer=2.3.0 kotlin_coroutines_version=1.10.2 -serializationVer=1.8.1 -fabric_loader_version=0.16.0 -fabric_language_kotlin=1.13.3+kotlin.2.1.21 -fabric_resource_loader_version=3.1.10+fa6cb72b9c -fabric_rendering_api_version=12.3.0+ac3e15d19c -fabric_api_base_version=0.4.63+9ec45cd89c -clothconfig_version=19.0.146 -modmenu_version=15.0.0-beta.1 +serializationVer=1.9.0 +fabric_loader_version=0.18.4 +fabric_language_kotlin=1.13.8+kotlin.2.3.0 +fabric_resource_loader_version=3.3.4+4fc5413f53 +fabric_rendering_api_version=16.2.5+1fb1cde953 +fabric_api_base_version=1.0.5+4ebb5c0853 +clothconfig_version=21.11.151 +modmenu_version=17.0.0-beta.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0b55a3b..03b32a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists