chore: nmcp refactorings

Author: sureshg

build.gradle.kts

@@ -17,24 +17,28 @@ nmcp {
 }
 
 dependencies {
-  dokka(project(":shared"))
-  dokka(project(":meta:ksp:processor"))
-  dokka(project(":meta:compiler:plugin"))
-  dokka(project(":backend:jvm"))
-  dokka(project(":backend:data"))
-  dokka(project(":backend:profiling"))
-  dokka(project(":backend:security"))
-  dokka(project(":web"))
+  dokka(projects.shared)
+  dokka(projects.meta.ksp.processor)
+  dokka(projects.meta.compiler.plugin)
+  dokka(projects.backend.jvm)
+  dokka(projects.backend.data)
+  dokka(projects.backend.profiling)
+  dokka(projects.backend.security)
+  dokka(projects.web)
 
-  //  nmcpAggregation(project(":shared"))
-  //  nmcpAggregation(project(":dep-mgmt:bom"))
-  //  nmcpAggregation(project(":dep-mgmt:catalog"))
-  //  nmcpAggregation(project(":meta:ksp:processor"))
-  //  nmcpAggregation(project(":meta:compiler:plugin"))
-  //  nmcpAggregation(project(":backend:jvm"))
-  //  nmcpAggregation(project(":backend:data"))
-  //  nmcpAggregation(project(":backend:profiling"))
-  //  nmcpAggregation(project(":backend:security"))
-  //  nmcpAggregation(project(":web"))
-  //  nmcpAggregation(// project(":backend:native")
+  nmcpAggregation(projects.shared)
+  nmcpAggregation(projects.depMgmt.bom)
+  nmcpAggregation(projects.depMgmt.catalog)
+  nmcpAggregation(projects.meta.ksp.processor)
+  nmcpAggregation(projects.meta.compiler.plugin)
+  nmcpAggregation(projects.backend.jvm)
+  nmcpAggregation(projects.backend.data)
+  nmcpAggregation(projects.backend.profiling)
+  nmcpAggregation(projects.backend.security)
+  nmcpAggregation(projects.web)
+
+  // Optional modules
+  findProject(":backend:native")?.let { nmcpAggregation(it) }
+  findProject(":compose:cmp")?.let { nmcpAggregation(it) }
+  findProject(":compose:html")?.let { nmcpAggregation(it) }
 }

gradle.properties

@@ -65,8 +65,8 @@ semver.logOnlyOnRootProject=true
 maven.snapshot.repo.enabled=false
 
 # Other projects
-composeBuild=true
-springBoot=false
+module.compose.enabled=true
+module.boot.enabled=false
 kotlin.target.native.enabled=false
 kotlin.target.win.enabled=false
 debug=false

gradle/build-logic/build.gradle.kts

@@ -158,7 +158,6 @@ dependencies {
   implementation(libs.plugins.gradle.develocity.dep)
   implementation(libs.plugins.foojay.resolver.dep)
   implementation(libs.plugins.redacted.dep)
-  implementation(libs.plugins.nmcp.dep)
   implementation(libs.plugins.spotless.dep)
   implementation(libs.plugins.shadow.dep)
   implementation(libs.plugins.mrjar.dep)
@@ -171,6 +170,8 @@ dependencies {
   implementation(libs.plugins.modulegraph.dep)
   implementation(libs.plugins.kopy.dep)
   implementation(libs.plugins.github.changelog.dep)
+  implementation(libs.plugins.nmcp.project.dep)
+  implementation(libs.plugins.nmcp.aggregation.dep)
 
   implementation(libs.tomlj)
   implementation(libs.jib.nativeimage.extn)

gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt

@@ -85,6 +85,12 @@ val Project.isNativeTargetEnabled: Boolean
 val Project.isWinTargetEnabled: Boolean
   get() = gradleBooleanProp("kotlin.target.win.enabled").get()
 
+val Project.isComposeModuleEnabled: Boolean
+  get() = gradleBooleanProp("module.compose.enabled").get()
+
+val Project.isBootModuleEnabled: Boolean
+  get() = gradleBooleanProp("module.boot.enabled").get()
+
 /** Java version properties. */
 val Project.javaVersion
   get() = libs.versions.java.asProvider().map { JavaVersion.toVersion(it) }

gradle/build-logic/src/main/kotlin/common/SettingsExtns.kt

@@ -1,6 +1,5 @@
 package common
 
-import kotlin.text.toBoolean
 import org.gradle.api.initialization.Settings
 import org.gradle.api.provider.Provider
 
@@ -13,8 +12,8 @@ val Settings.isNativeTargetEnabled: Boolean
 val Settings.isWinTargetEnabled: Boolean
   get() = gradleBooleanProp("kotlin.target.win.enabled").get()
 
-val Settings.isComposeEnabled: Boolean
-  get() = gradleBooleanProp("compose.enabled").get()
+val Settings.isComposeModuleEnabled: Boolean
+  get() = gradleBooleanProp("module.compose.enabled").get()
 
-val Settings.isSpringBootEnabled: Boolean
-  get() = gradleBooleanProp("springboot.enabled").get()
+val Settings.isBootModuleEnabled: Boolean
+  get() = gradleBooleanProp("module.boot.enabled").get()

gradle/libs.versions.toml

@@ -218,7 +218,7 @@ swagger-style                  = "https://unpkg.com/[email protected]/them
 benmanes                       = "0.52.0"
 foojay-resolver                = "0.10.0"
 gradle-develocity              = "4.0.1"
-nmcp                           = "0.1.1"
+nmcp                           = "0.1.2"
 nexus-publish                  = "2.0.0"
 vanniktech-publish             = "0.31.0"
 gradle-publish                 = "1.3.1"
@@ -714,7 +714,8 @@ sigstore                             = { id = "dev.sigstore.sign"
 sigstore-base                        = { id = "dev.sigstore.sign-base"                                         , version.ref = "sigstore" }
 buildkonfig                          = { id = "com.codingfeline.buildkonfig"                                   , version.ref = "buildkonfig"}
 detekt                               = { id = "io.github.detekt.gradle.compiler-plugin"                        , version.ref = "detekt"}
-nmcp                                 = { id = "com.gradleup.nmcp"                                              , version.ref = "nmcp"}
+nmcp-project                         = { id = "com.gradleup.nmcp"                                              , version.ref = "nmcp"}
+nmcp-aggregation                     = { id = "com.gradleup.nmcp.aggregation"                                  , version.ref = "nmcp"}
 vanniktech-publish                   = { id = "com.vanniktech.maven.publish"                                   , version.ref = "vanniktech-publish" }
 gradle-publish                       = { id = "com.gradle.plugin-publish"                                      , version.ref = "gradle-publish" }
 kobweb-application                   = { id = "com.varabyte.kobweb.application"                                , version.ref = "kobweb" }

settings.gradle.kts

@@ -1,3 +1,5 @@
+import common.*
+
 pluginManagement {
   repositories {
     mavenCentral()
@@ -40,13 +42,13 @@ if (isNativeTargetEnabled) {
   include(":backend:native")
 }
 
-if (isComposeEnabled) {
+if (isComposeModuleEnabled) {
   include(":compose:cmp")
   // include(":compose:cli")
   // include(":compose:html")
 }
 
-if (isSpringBootEnabled) {
+if (isBootModuleEnabled) {
   include(":backend:boot")
 }
 
@@ -55,18 +57,3 @@ if (isSpringBootEnabled) {
 //        substitute(module("dev.suresh:misc-build")).using(project(":"))
 //    }
 // }
-
-val Settings.isNativeTargetEnabled: Boolean
-  get() = gradleBooleanProp("kotlin.target.native.enabled").get()
-
-val Settings.isComposeEnabled: Boolean
-  get() = gradleBooleanProp("composeBuild").get()
-
-val Settings.isSpringBootEnabled: Boolean
-  get() = gradleBooleanProp("springBoot").get()
-
-val Settings.isWinTargetEnabled: Boolean
-  get() = gradleBooleanProp("kotlin.target.win.enabled").get()
-
-fun Settings.gradleBooleanProp(name: String): Provider<Boolean> =
-    providers.gradleProperty(name).map(String::toBoolean).orElse(false)