diff --git a/build-logic/gradm/gradm.yml b/build-logic/gradm/gradm.yml index df4ab2f..2ae11ca 100644 --- a/build-logic/gradm/gradm.yml +++ b/build-logic/gradm/gradm.yml @@ -1,5 +1,5 @@ versions: - consensus: "0.10.0" + consensus: "0.11.0" gradle: "8.9" kotlin: "2.0.0" plugins: @@ -18,6 +18,7 @@ plugins: omico: me.omico.consensus.api: ${versions.consensus} me.omico.consensus.git: ${versions.consensus} + me.omico.consensus.root: ${versions.consensus} me.omico.consensus.spotless: ${versions.consensus} dependencies: diff --git a/build-logic/initialization/settings.gradle.kts b/build-logic/initialization/settings.gradle.kts index d2c8597..d473adf 100644 --- a/build-logic/initialization/settings.gradle.kts +++ b/build-logic/initialization/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "gpi-initialization" +rootProject.name = "gpi-build-logic-initialization" pluginManagement { includeBuild("../gradm") diff --git a/build-logic/project/build.gradle.kts b/build-logic/project/build.gradle.kts index 811e539..937906e 100644 --- a/build-logic/project/build.gradle.kts +++ b/build-logic/project/build.gradle.kts @@ -8,5 +8,6 @@ dependencies { implementation(kotlinGradlePlugin) implementation(me.omico.consensus.api) implementation(me.omico.consensus.git) + implementation(me.omico.consensus.root) implementation(me.omico.consensus.spotless) } diff --git a/build-logic/project/settings.gradle.kts b/build-logic/project/settings.gradle.kts index 893fae9..646a26e 100644 --- a/build-logic/project/settings.gradle.kts +++ b/build-logic/project/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "gpi-project" +rootProject.name = "gpi-build-logic-project" pluginManagement { includeBuild("../gradm") diff --git a/build-logic/project/src/main/kotlin/gpi.root.gradle.kts b/build-logic/project/src/main/kotlin/gpi.root.gradle.kts index 4847de3..85a7f91 100644 --- a/build-logic/project/src/main/kotlin/gpi.root.gradle.kts +++ b/build-logic/project/src/main/kotlin/gpi.root.gradle.kts @@ -1,21 +1,11 @@ -import me.omico.consensus.api.dsl.requireRootProject - plugins { + id("me.omico.consensus.root") id("gpi.gradm") id("gpi.root.git") id("gpi.root.spotless") } -requireRootProject() - -consensus { - allprojects { - group = gradleProperty("project.group") - version = gradleProperty("project.version") - } -} - -val wrapper: Wrapper by tasks.named("wrapper") { +tasks.named("wrapper") { gradleVersion = versions.gradle distributionType = Wrapper.DistributionType.BIN }