From b4e4e495d66f1e8cdb6226bb8333643ca6503b3e Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 27 Nov 2024 22:31:31 +0000
Subject: [PATCH] More fixes

---
 .../fabricmc/loom/util/kotlin/KotlinClasspathService.java | 7 +++----
 .../net/fabricmc/loom/util/kotlin/KotlinPluginUtils.java  | 5 -----
 src/test/resources/projects/kotlin/build.gradle.kts       | 8 ++++----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/fabricmc/loom/util/kotlin/KotlinClasspathService.java b/src/main/java/net/fabricmc/loom/util/kotlin/KotlinClasspathService.java
index 9672dc90c..3f89a7f5f 100644
--- a/src/main/java/net/fabricmc/loom/util/kotlin/KotlinClasspathService.java
+++ b/src/main/java/net/fabricmc/loom/util/kotlin/KotlinClasspathService.java
@@ -61,17 +61,16 @@ public static Provider<Options> createOptions(Project project) {
 
 		return createOptions(
 				project,
-				KotlinPluginUtils.getKotlinPluginVersion(project),
-				KotlinPluginUtils.getKotlinMetadataVersion()
+				KotlinPluginUtils.getKotlinPluginVersion(project)
 		);
 	}
 
-	private static Provider<Options> createOptions(Project project, String kotlinVersion, String kotlinMetadataVersion) {
+	private static Provider<Options> createOptions(Project project, String kotlinVersion) {
 		// Create a detached config to resolve the kotlin std lib for the provided version.
 		Configuration detachedConfiguration = project.getConfigurations().detachedConfiguration(
 				project.getDependencies().create("org.jetbrains.kotlin:kotlin-stdlib:" + kotlinVersion),
 				// Load kotlinx-metadata-jvm like this to work around: https://github.com/gradle/gradle/issues/14727
-				project.getDependencies().create("org.jetbrains.kotlinx:kotlinx-metadata-jvm:" + kotlinMetadataVersion)
+				project.getDependencies().create("org.jetbrains.kotlin:kotlin-metadata-jvm:" + kotlinVersion)
 		);
 
 		return TYPE.create(project, options -> {
diff --git a/src/main/java/net/fabricmc/loom/util/kotlin/KotlinPluginUtils.java b/src/main/java/net/fabricmc/loom/util/kotlin/KotlinPluginUtils.java
index ac6250e45..8de617f36 100644
--- a/src/main/java/net/fabricmc/loom/util/kotlin/KotlinPluginUtils.java
+++ b/src/main/java/net/fabricmc/loom/util/kotlin/KotlinPluginUtils.java
@@ -29,7 +29,6 @@
 import java.io.UncheckedIOException;
 import java.util.Properties;
 
-import kotlin.metadata.jvm.KotlinClassMetadata;
 import org.gradle.api.Project;
 
 public class KotlinPluginUtils {
@@ -56,8 +55,4 @@ private static String loadPropertyFromResources(Class<?> kotlinPluginClass, Stri
 
 		return props.getProperty(property);
 	}
-
-	public static String getKotlinMetadataVersion() {
-		return KotlinClassMetadata.class.getPackage().getImplementationVersion().split("-")[0];
-	}
 }
diff --git a/src/test/resources/projects/kotlin/build.gradle.kts b/src/test/resources/projects/kotlin/build.gradle.kts
index 75a1015d2..37f00bb8c 100644
--- a/src/test/resources/projects/kotlin/build.gradle.kts
+++ b/src/test/resources/projects/kotlin/build.gradle.kts
@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
 plugins {
-	kotlin("jvm") version "1.9.22"
-	kotlin("plugin.serialization") version "1.9.22"
+	kotlin("jvm") version "2.0.21"
+	kotlin("plugin.serialization") version "2.0.21"
 	id("fabric-loom")
 	`maven-publish`
 }
@@ -31,8 +31,8 @@ version = "0.0.1"
 dependencies {
 	minecraft(group = "com.mojang", name = "minecraft", version = "1.16.5")
 	mappings(group = "net.fabricmc", name = "yarn", version = "1.16.5+build.5", classifier = "v2")
-	modImplementation("net.fabricmc:fabric-loader:0.12.12")
-	modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = "1.10.17+kotlin.1.9.22")
+	modImplementation("net.fabricmc:fabric-loader:0.16.9")
+	modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = "1.12.3+kotlin.2.0.21")
 }
 
 publishing {