From cd8c3a9ce34b0401debe41007fd548a9d8c33594 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Mon, 19 Oct 2026 20:36:38 +0200 Subject: [PATCH] fix: Support Gradle isolated projects --- .../gradle/settings_plugin/SmcmtkSettingsPlugin.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle-settings-plugin/src/main/kotlin/de/siphalor/minecraft_modding_toolkit/gradle/settings_plugin/SmcmtkSettingsPlugin.kt b/gradle-settings-plugin/src/main/kotlin/de/siphalor/minecraft_modding_toolkit/gradle/settings_plugin/SmcmtkSettingsPlugin.kt index 3486713..23c8937 100644 --- a/gradle-settings-plugin/src/main/kotlin/de/siphalor/minecraft_modding_toolkit/gradle/settings_plugin/SmcmtkSettingsPlugin.kt +++ b/gradle-settings-plugin/src/main/kotlin/de/siphalor/minecraft_modding_toolkit/gradle/settings_plugin/SmcmtkSettingsPlugin.kt @@ -17,7 +17,7 @@ abstract class SmcmtkSettingsPlugin : Plugin { @get:Inject protected abstract val objectFactory: ObjectFactory - private val logger = lazy { Logging.getLogger(javaClass) } + private val logger by lazy { Logging.getLogger(javaClass) } override fun apply(settings: Settings) { val gradleProperties = loadProperties(settings.rootDir.resolve("gradle.properties")) @@ -39,7 +39,7 @@ abstract class SmcmtkSettingsPlugin : Plugin { } if (fabricLoomModule != null) { - logger.value.info("Choosing Fabric Loom $fabricLoomModule") + logger.info("Choosing Fabric Loom $fabricLoomModule") } settings.pluginManagement.plugins { @@ -58,13 +58,13 @@ abstract class SmcmtkSettingsPlugin : Plugin { } } if (fabricLoom == "plain") { - settings.gradle.allprojects { project -> + settings.gradle.lifecycle.beforeProject { project -> project.extensions.findByType(ExtraPropertiesExtension::class.java)?.apply { // Loom uses the same jar for both plugin variants (plain and remap) and tries to determine // which one is in use by checking the plugin manager. // This doesn't seem to work when using convention plugins, so we're forcing the remapping off here. - project.extensions.extraProperties.set("fabric.loom.disableObfuscation", "true") - project.extensions.extraProperties.set("fabric.loom.dontRemap", "true") + set("fabric.loom.disableObfuscation", "true") + set("fabric.loom.dontRemap", "true") } } }