Skip to content

Remove KGP #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Taskeren wants to merge 2 commits into
base: v1.x
Choose a base branch
from
Open

Remove KGP #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fde4f36
Remove KGP dependency
Taskeren Feb 3, 2026
c2690e7
SA
Taskeren Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 15 additions & 7 deletions src/main/java/com/gtnewhorizons/gtnhgradle/modules/ToolchainModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -183,9 +183,17 @@ 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()
Object extension = project.getExtensions()
.getByName("kotlin");
kotlin.jvmToolchain(8);
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<String> disabledKotlinTasks = ImmutableSet.of(
"kaptGenerateStubsMcLauncherKotlin",
"kaptGenerateStubsPatchedMcKotlin",
Expand Down