From fde4f365043b3181e20bcc137fef5ed498b7da6c Mon Sep 17 00:00:00 2001 From: Taskeren Date: Tue, 3 Feb 2026 12:29:07 +0800 Subject: [PATCH 1/2] Remove KGP dependency --- build.gradle.kts | 3 --- .../gtnhgradle/modules/ToolchainModule.java | 22 ++++++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 50c3bfa9..f54d8c07 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,9 +50,6 @@ dependencies { api(pluginDep("com.gradleup.shadow", "8.3.9")) api(pluginDep("com.palantir.git-version", "3.4.0")) api(pluginDep("org.jetbrains.gradle.plugin.idea-ext", "1.1.10")) - api(pluginDep("org.jetbrains.kotlin.jvm", "2.1.10")) - api(pluginDep("org.jetbrains.kotlin.kapt", "2.1.10")) - api(pluginDep("com.google.devtools.ksp", "2.1.10-1.0.29")) // 1.0.29 is the last jvm8 supporting version api(pluginDep("org.ajoberstar.grgit", "4.1.1")) // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle api(pluginDep("de.undercouch.download", "5.6.0")) api(pluginDep("com.github.gmazzo.buildconfig", "5.5.4")) // 5.5.4 is the last jvm8 supporting version, unused, available for addon.gradle diff --git a/src/main/java/com/gtnewhorizons/gtnhgradle/modules/ToolchainModule.java b/src/main/java/com/gtnewhorizons/gtnhgradle/modules/ToolchainModule.java index 8783a892..4d8027ef 100644 --- a/src/main/java/com/gtnewhorizons/gtnhgradle/modules/ToolchainModule.java +++ b/src/main/java/com/gtnewhorizons/gtnhgradle/modules/ToolchainModule.java @@ -1,9 +1,5 @@ package com.gtnewhorizons.gtnhgradle.modules; -import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask; -import com.gtnewhorizons.retrofuturagradle.modutils.ModUtils; -import com.gtnewhorizons.retrofuturagradle.shadow.com.google.common.collect.ImmutableMap; -import com.gtnewhorizons.retrofuturagradle.shadow.com.google.common.collect.ImmutableSet; import com.gtnewhorizons.gtnhgradle.GTNHConstants; import com.gtnewhorizons.gtnhgradle.GTNHGradlePlugin; import com.gtnewhorizons.gtnhgradle.GTNHModule; @@ -14,6 +10,10 @@ import com.gtnewhorizons.retrofuturagradle.mcp.InjectTagsTask; import com.gtnewhorizons.retrofuturagradle.mcp.MCPTasks; import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar; +import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask; +import com.gtnewhorizons.retrofuturagradle.modutils.ModUtils; +import com.gtnewhorizons.retrofuturagradle.shadow.com.google.common.collect.ImmutableMap; +import com.gtnewhorizons.retrofuturagradle.shadow.com.google.common.collect.ImmutableSet; import com.gtnewhorizons.retrofuturagradle.util.ProviderToStringWrapper; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; @@ -43,9 +43,9 @@ import org.gradle.jvm.toolchain.JvmVendorSpec; import org.gradle.language.jvm.tasks.ProcessResources; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension; import javax.inject.Inject; +import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Objects; @@ -183,9 +183,15 @@ public void apply(GTNHGradlePlugin.@NotNull GTNHExtension gtnh, @NotNull Project // Set up Kotlin if enabled project.getPlugins() .withId("org.jetbrains.kotlin.jvm", plugin -> { - final KotlinBaseExtension kotlin = (KotlinBaseExtension) project.getExtensions() - .getByName("kotlin"); - kotlin.jvmToolchain(8); + Object extension = project.getExtensions().getByName("kotlin"); + try { + // Use reflection to remove the kgp dependency + // kotlin.jvmToolchain(8) + Method jvmToolchainMethod = extension.getClass().getMethod("jvmToolchain", Integer.TYPE); + jvmToolchainMethod.invoke(extension, 8); + } catch (Throwable t) { + throw new RuntimeException(t); + } final Set disabledKotlinTasks = ImmutableSet.of( "kaptGenerateStubsMcLauncherKotlin", "kaptGenerateStubsPatchedMcKotlin", From c2690e75738c93622f4a6e58d3203c0576584070 Mon Sep 17 00:00:00 2001 From: Taskeren Date: Tue, 3 Feb 2026 12:29:51 +0800 Subject: [PATCH 2/2] SA --- .../gtnewhorizons/gtnhgradle/modules/ToolchainModule.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/gtnhgradle/modules/ToolchainModule.java b/src/main/java/com/gtnewhorizons/gtnhgradle/modules/ToolchainModule.java index 4d8027ef..cb408a4c 100644 --- a/src/main/java/com/gtnewhorizons/gtnhgradle/modules/ToolchainModule.java +++ b/src/main/java/com/gtnewhorizons/gtnhgradle/modules/ToolchainModule.java @@ -183,11 +183,13 @@ public void apply(GTNHGradlePlugin.@NotNull GTNHExtension gtnh, @NotNull Project // Set up Kotlin if enabled project.getPlugins() .withId("org.jetbrains.kotlin.jvm", plugin -> { - Object extension = project.getExtensions().getByName("kotlin"); + Object extension = project.getExtensions() + .getByName("kotlin"); try { // Use reflection to remove the kgp dependency // kotlin.jvmToolchain(8) - Method jvmToolchainMethod = extension.getClass().getMethod("jvmToolchain", Integer.TYPE); + Method jvmToolchainMethod = extension.getClass() + .getMethod("jvmToolchain", Integer.TYPE); jvmToolchainMethod.invoke(extension, 8); } catch (Throwable t) { throw new RuntimeException(t);