[build] Restructure to composite build

buildSrc/settings.gradle.kts

@@ -1,13 +0,0 @@
-plugins {
-    id("dev.panuszewski.typesafe-conventions") version "0.7.3"
-}
-
-dependencyResolutionManagement {
-	repositories {
-		gradlePluginPortal()
-	}
-}
-
-include("helpers")
-
-rootProject.name = "tweed5-conventions"

conventions/settings.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    id("dev.panuszewski.typesafe-conventions") version "0.9.0"
+}
+
+dependencyResolutionManagement {
+	repositories {
+		gradlePluginPortal()
+	}
+	versionCatalogs {
+		create("libs") {
+			from(files("../gradle/libs.versions.toml"))
+		}
+	}
+}
+
+include("helpers")
+
+rootProject.name = "tweed5-conventions"

conventions/src/main/kotlin/de.siphalor.tweed5.minecraft.mod.dummy.gradle.kts

@@ -8,7 +8,7 @@ val processMinecraftModResources = tasks.register<Copy>("processMinecraftModReso
 	inputs.property("name", properties["module.name"])
 	inputs.property("description", properties["module.description"])
 
-	from(project.layout.settingsDirectory.dir("minecraft/mod-template/resources"))
+	from(project.layout.settingsDirectory.dir("../tweed5-minecraft/mod-template/resources"))
 	expand(mapOf(
 		"id" to project.name,
 		"version" to project.version,

conventions/src/main/kotlin/de.siphalor.tweed5.root-properties.gradle.kts

@@ -0,0 +1,5 @@
+import java.util.Properties
+
+val rootProperties = Properties()
+project.layout.settingsDirectory.file("../gradle.properties").asFile.inputStream().use { rootProperties.load(it) }
+rootProperties.forEach { (key, value) -> project.ext.set(key.toString(), value.toString()) }

gradle.properties

@@ -1,5 +1,5 @@
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache = true
 
-version = 0.2.0
+tweed5.version = 0.2.0
 
 git.url = https://gitea.siphalor.de/siphalor/tweed5

settings.gradle.kts

@@ -1,38 +1,4 @@
-rootProject.name = "tweed5"
+rootProject.name = "tweed5-composite"
 
-dependencyResolutionManagement {
-	repositories {
-		mavenCentral()
-	}
-}
-
-include("test-utils")
-include("tweed5-annotation-inheritance")
-include("tweed5-attributes-extension")
-include("tweed5-comment-loader-extension")
-include("tweed5-construct")
-include("tweed5-core")
-include("tweed5-default-extensions")
-include("tweed5-naming-format")
-include("tweed5-patchwork")
-include("tweed5-serde-api")
-include("tweed5-serde-extension")
-include("tweed5-serde-gson")
-include("tweed5-serde-hjson")
-include("tweed5-serde-jackson")
-include("tweed5-type-utils")
-include("tweed5-utils")
-include("tweed5-weaver-pojo")
-include("tweed5-weaver-pojo-attributes-extension")
-include("tweed5-weaver-pojo-serde-extension")
-include("tweed5-weaver-pojo-validation-extension")
-
-includeAs("minecraft:tweed5-bundle", "minecraft/tweed5-bundle")
-
-includeAs("generic-test-utils", "test-utils/generic")
-includeAs("serde-json-test-utils", "test-utils/serde-json")
-
-fun includeAs(name: String, path: String) {
-    include(name)
-    project(":$name").projectDir = file(path)
-}
+includeBuild("tweed5")
+includeBuild("tweed5-minecraft")

tweed5-minecraft/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+	`maven-publish`
+	id("de.siphalor.tweed5.root-properties")
+}
+
+group = "de.siphalor.tweed5.minecraft"
+version = project.property("tweed5.version").toString()

tweed5-minecraft/bundle/build.gradle.kts

@@ -12,14 +12,14 @@ val bundledSourcesConfiguration = configurations.resolvable("bundledSources") {
 }
 
 dependencies {
-	implementation(project(":tweed5-core"))
-	implementation(project(":tweed5-attributes-extension"))
-	implementation(project(":tweed5-default-extensions"))
-	implementation(project(":tweed5-serde-extension"))
-	implementation(project(":tweed5-weaver-pojo"))
-	implementation(project(":tweed5-weaver-pojo-attributes-extension"))
-	implementation(project(":tweed5-weaver-pojo-serde-extension"))
-	implementation(project(":tweed5-weaver-pojo-validation-extension"))
+	implementation("de.siphalor.tweed5:tweed5-core")
+	implementation("de.siphalor.tweed5:tweed5-attributes-extension")
+	implementation("de.siphalor.tweed5:tweed5-default-extensions")
+	implementation("de.siphalor.tweed5:tweed5-serde-extension")
+	implementation("de.siphalor.tweed5:tweed5-weaver-pojo")
+	implementation("de.siphalor.tweed5:tweed5-weaver-pojo-attributes-extension")
+	implementation("de.siphalor.tweed5:tweed5-weaver-pojo-serde-extension")
+	implementation("de.siphalor.tweed5:tweed5-weaver-pojo-validation-extension")
 }
 
 tasks.shadowJar {

tweed5-minecraft/settings.gradle.kts

@@ -0,0 +1,29 @@
+rootProject.name = "tweed5-minecraft"
+
+pluginManagement {
+	includeBuild("../conventions")
+}
+
+dependencyResolutionManagement {
+	repositories {
+		mavenCentral()
+	}
+	versionCatalogs {
+		create("libs") {
+			from(files("../gradle/libs.versions.toml"))
+		}
+	}
+}
+
+includeBuild("../tweed5")
+
+includeNormalModule("bundle")
+
+fun includeNormalModule(name: String) {
+	includeAs("tweed5-$name", "$name")
+}
+
+fun includeAs(name: String, path: String) {
+	include(name)
+	project(":$name").projectDir = file(path)
+}

tweed5/build.gradle.kts

@@ -1,10 +1,11 @@
 plugins {
 	`jacoco-report-aggregation`
 	`maven-publish`
+	id("de.siphalor.tweed5.root-properties")
 }
 
 group = "de.siphalor.tweed5"
-version = properties["version"]!!
+version = project.property("tweed5.version").toString()
 
 dependencies {
 	rootProject.subprojects.forEach { subproject ->

tweed5/default-extensions/build.gradle.kts

@@ -7,4 +7,4 @@ dependencies {
     api(project(":tweed5-serde-extension"))
 
     testImplementation(project(":tweed5-serde-hjson"))
-}
+}