From f268709f027b0d4f7501ab3457f02a4563c56cc2 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Sun, 23 Aug 2026 10:40:29 +0200 Subject: [PATCH] build: Rename all Gradle build logic modules to build-logic --- {conventions => build-logic}/build.gradle.kts | 2 +- {conventions => build-logic}/helpers/build.gradle.kts | 0 .../plugin/minecraft/mod/MinecraftModComponentPlugin.kt | 0 .../tweed5/gradle/plugin/minecraft/mod/MinecraftModded.kt | 0 .../tweed5/gradle/plugin/module_info/ModuleInfoExtension.kt | 0 .../tweed5/gradle/plugin/module_info/ModuleInfoPlugin.kt | 0 .../plugin/root_properties/RootPropertiesExtension.kt | 0 .../gradle/plugin/root_properties/RootPropertiesPlugin.kt | 0 {conventions => build-logic}/settings.gradle.kts | 6 +++--- .../main/kotlin/de.siphalor.tweed5.base-module.gradle.kts | 0 .../de.siphalor.tweed5.expanded-sources-jar.gradle.kts | 0 .../kotlin/de.siphalor.tweed5.local-runtime-only.gradle.kts | 0 .../kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts | 0 .../de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts | 0 .../main/kotlin/de.siphalor.tweed5.publishing.gradle.kts | 0 .../kotlin/de.siphalor.tweed5.shadow.explicit.gradle.kts | 0 .../main/kotlin/de.siphalor.tweed5.test-utils.gradle.kts | 0 .../main/kotlin/de.siphalor.tweed5.unit-tests.gradle.kts | 0 tweed5-minecraft/{buildSrc => build-logic}/build.gradle.kts | 4 ++-- .../{buildSrc => build-logic}/settings.gradle.kts | 4 ++-- .../de.siphalor.tweed5.minecraft.mod.bundle.gradle.kts | 0 ...e.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts | 0 tweed5-minecraft/gradle.properties | 2 +- tweed5-minecraft/settings.gradle.kts | 5 ++++- tweed5/settings.gradle.kts | 2 +- 25 files changed, 14 insertions(+), 11 deletions(-) rename {conventions => build-logic}/build.gradle.kts (79%) rename {conventions => build-logic}/helpers/build.gradle.kts (100%) rename {conventions => build-logic}/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModComponentPlugin.kt (100%) rename {conventions => build-logic}/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModded.kt (100%) rename {conventions => build-logic}/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoExtension.kt (100%) rename {conventions => build-logic}/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoPlugin.kt (100%) rename {conventions => build-logic}/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesExtension.kt (100%) rename {conventions => build-logic}/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesPlugin.kt (100%) rename {conventions => build-logic}/settings.gradle.kts (68%) rename {conventions => build-logic}/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts (100%) rename {conventions => build-logic}/src/main/kotlin/de.siphalor.tweed5.expanded-sources-jar.gradle.kts (100%) rename {conventions => build-logic}/src/main/kotlin/de.siphalor.tweed5.local-runtime-only.gradle.kts (100%) rename {conventions => build-logic}/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts (100%) rename {conventions => build-logic}/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts (100%) rename {conventions => build-logic}/src/main/kotlin/de.siphalor.tweed5.publishing.gradle.kts (100%) rename {conventions => build-logic}/src/main/kotlin/de.siphalor.tweed5.shadow.explicit.gradle.kts (100%) rename {conventions => build-logic}/src/main/kotlin/de.siphalor.tweed5.test-utils.gradle.kts (100%) rename {conventions => build-logic}/src/main/kotlin/de.siphalor.tweed5.unit-tests.gradle.kts (100%) rename tweed5-minecraft/{buildSrc => build-logic}/build.gradle.kts (75%) rename tweed5-minecraft/{buildSrc => build-logic}/settings.gradle.kts (86%) rename tweed5-minecraft/{buildSrc => build-logic}/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.bundle.gradle.kts (100%) rename tweed5-minecraft/{buildSrc => build-logic}/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts (100%) diff --git a/conventions/build.gradle.kts b/build-logic/build.gradle.kts similarity index 79% rename from conventions/build.gradle.kts rename to build-logic/build.gradle.kts index ff1f78b..063e838 100644 --- a/conventions/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -7,7 +7,7 @@ plugins { group = "de.siphalor.tweed5" dependencies { - implementation(project(":tweed5-conventions-helpers")) + implementation(project(":tweed5-build-logic-helpers")) implementation(pluginMarker(libs.plugins.lombok)) implementation(pluginMarker(libs.plugins.shadow)) } diff --git a/conventions/helpers/build.gradle.kts b/build-logic/helpers/build.gradle.kts similarity index 100% rename from conventions/helpers/build.gradle.kts rename to build-logic/helpers/build.gradle.kts diff --git a/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModComponentPlugin.kt b/build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModComponentPlugin.kt similarity index 100% rename from conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModComponentPlugin.kt rename to build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModComponentPlugin.kt diff --git a/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModded.kt b/build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModded.kt similarity index 100% rename from conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModded.kt rename to build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/minecraft/mod/MinecraftModded.kt diff --git a/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoExtension.kt b/build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoExtension.kt similarity index 100% rename from conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoExtension.kt rename to build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoExtension.kt diff --git a/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoPlugin.kt b/build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoPlugin.kt similarity index 100% rename from conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoPlugin.kt rename to build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/module_info/ModuleInfoPlugin.kt diff --git a/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesExtension.kt b/build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesExtension.kt similarity index 100% rename from conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesExtension.kt rename to build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesExtension.kt diff --git a/conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesPlugin.kt b/build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesPlugin.kt similarity index 100% rename from conventions/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesPlugin.kt rename to build-logic/helpers/src/main/kotlin/de/siphalor/tweed5/gradle/plugin/root_properties/RootPropertiesPlugin.kt diff --git a/conventions/settings.gradle.kts b/build-logic/settings.gradle.kts similarity index 68% rename from conventions/settings.gradle.kts rename to build-logic/settings.gradle.kts index b0682e2..a7b6a52 100644 --- a/conventions/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -17,7 +17,7 @@ dependencyResolutionManagement { } } -include(":tweed5-conventions-helpers") -project(":tweed5-conventions-helpers").projectDir = file("helpers") +include(":tweed5-build-logic-helpers") +project(":tweed5-build-logic-helpers").projectDir = file("helpers") -rootProject.name = "tweed5-conventions" +rootProject.name = "tweed5-build-logic" diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts b/build-logic/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts similarity index 100% rename from conventions/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts rename to build-logic/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.expanded-sources-jar.gradle.kts b/build-logic/src/main/kotlin/de.siphalor.tweed5.expanded-sources-jar.gradle.kts similarity index 100% rename from conventions/src/main/kotlin/de.siphalor.tweed5.expanded-sources-jar.gradle.kts rename to build-logic/src/main/kotlin/de.siphalor.tweed5.expanded-sources-jar.gradle.kts diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.local-runtime-only.gradle.kts b/build-logic/src/main/kotlin/de.siphalor.tweed5.local-runtime-only.gradle.kts similarity index 100% rename from conventions/src/main/kotlin/de.siphalor.tweed5.local-runtime-only.gradle.kts rename to build-logic/src/main/kotlin/de.siphalor.tweed5.local-runtime-only.gradle.kts diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts b/build-logic/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts similarity index 100% rename from conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts rename to build-logic/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.base.gradle.kts diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts b/build-logic/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts similarity index 100% rename from conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts rename to build-logic/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.publishing.gradle.kts b/build-logic/src/main/kotlin/de.siphalor.tweed5.publishing.gradle.kts similarity index 100% rename from conventions/src/main/kotlin/de.siphalor.tweed5.publishing.gradle.kts rename to build-logic/src/main/kotlin/de.siphalor.tweed5.publishing.gradle.kts diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.shadow.explicit.gradle.kts b/build-logic/src/main/kotlin/de.siphalor.tweed5.shadow.explicit.gradle.kts similarity index 100% rename from conventions/src/main/kotlin/de.siphalor.tweed5.shadow.explicit.gradle.kts rename to build-logic/src/main/kotlin/de.siphalor.tweed5.shadow.explicit.gradle.kts diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.test-utils.gradle.kts b/build-logic/src/main/kotlin/de.siphalor.tweed5.test-utils.gradle.kts similarity index 100% rename from conventions/src/main/kotlin/de.siphalor.tweed5.test-utils.gradle.kts rename to build-logic/src/main/kotlin/de.siphalor.tweed5.test-utils.gradle.kts diff --git a/conventions/src/main/kotlin/de.siphalor.tweed5.unit-tests.gradle.kts b/build-logic/src/main/kotlin/de.siphalor.tweed5.unit-tests.gradle.kts similarity index 100% rename from conventions/src/main/kotlin/de.siphalor.tweed5.unit-tests.gradle.kts rename to build-logic/src/main/kotlin/de.siphalor.tweed5.unit-tests.gradle.kts diff --git a/tweed5-minecraft/buildSrc/build.gradle.kts b/tweed5-minecraft/build-logic/build.gradle.kts similarity index 75% rename from tweed5-minecraft/buildSrc/build.gradle.kts rename to tweed5-minecraft/build-logic/build.gradle.kts index 07931a7..62ce1c8 100644 --- a/tweed5-minecraft/buildSrc/build.gradle.kts +++ b/tweed5-minecraft/build-logic/build.gradle.kts @@ -5,8 +5,8 @@ plugins { } dependencies { - implementation("de.siphalor.tweed5:tweed5-conventions") - implementation("de.siphalor.tweed5:tweed5-conventions-helpers") + implementation("de.siphalor.tweed5:tweed5-build-logic") + implementation("de.siphalor.tweed5:tweed5-build-logic-helpers") implementation(pluginMarker(mcCommonLibs.plugins.smcmtk)) implementation(pluginMarker(mcCommonLibs.plugins.jcyo)) implementation(pluginMarker(mcLibs.plugins.fabric.loom)) diff --git a/tweed5-minecraft/buildSrc/settings.gradle.kts b/tweed5-minecraft/build-logic/settings.gradle.kts similarity index 86% rename from tweed5-minecraft/buildSrc/settings.gradle.kts rename to tweed5-minecraft/build-logic/settings.gradle.kts index e7d74b5..74931f9 100644 --- a/tweed5-minecraft/buildSrc/settings.gradle.kts +++ b/tweed5-minecraft/build-logic/settings.gradle.kts @@ -27,6 +27,6 @@ dependencyResolutionManagement { } } -includeBuild("../../conventions") +includeBuild("../../build-logic") -rootProject.name = "tweed5-minecraft-conventions" +rootProject.name = "tweed5-minecraft-build-logic" diff --git a/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.bundle.gradle.kts b/tweed5-minecraft/build-logic/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.bundle.gradle.kts similarity index 100% rename from tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.bundle.gradle.kts rename to tweed5-minecraft/build-logic/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.bundle.gradle.kts diff --git a/tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts b/tweed5-minecraft/build-logic/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts similarity index 100% rename from tweed5-minecraft/buildSrc/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts rename to tweed5-minecraft/build-logic/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.cross-version.gradle.kts diff --git a/tweed5-minecraft/gradle.properties b/tweed5-minecraft/gradle.properties index bdf22d0..2c68ee8 100644 --- a/tweed5-minecraft/gradle.properties +++ b/tweed5-minecraft/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs = -Xmx2G org.gradle.configuration-cache = true -minecraft.version.descriptor = 1.16.5 +minecraft.version.descriptor = 26.2.0 diff --git a/tweed5-minecraft/settings.gradle.kts b/tweed5-minecraft/settings.gradle.kts index 5616a05..cfd754d 100644 --- a/tweed5-minecraft/settings.gradle.kts +++ b/tweed5-minecraft/settings.gradle.kts @@ -1,7 +1,10 @@ rootProject.name = "tweed5-minecraft" pluginManagement { - includeBuild("../conventions") + includeBuild("../build-logic") + includeBuild("build-logic") { + name = "minecraft-build-logic" + } repositories { gradlePluginPortal() diff --git a/tweed5/settings.gradle.kts b/tweed5/settings.gradle.kts index fca6060..b6ec00e 100644 --- a/tweed5/settings.gradle.kts +++ b/tweed5/settings.gradle.kts @@ -1,7 +1,7 @@ rootProject.name = "tweed5" pluginManagement { - includeBuild("../conventions") + includeBuild("../build-logic") } dependencyResolutionManagement {