Better support for gradle composite builds

.github/workflows/style.yml

@@ -20,7 +20,7 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: build-logic Code Style Check with Gradle and Spotless
-        run: ./gradlew :build-logic:clean :build-logic:spotlessCheck
+      - name: build-logic-ncj Code Style Check with Gradle and Spotless
+        run: ./gradlew :build-logic-ncj:clean :build-logic-ncj:spotlessCheck
       - name: netCDF-Java Code Style Check with Gradle and Spotless
         run: ./gradlew clean spotlessCheck

.github/workflows/tests.yml

@@ -22,7 +22,7 @@ jobs:
           JDK8: /usr/thredds-test-environment/${{ matrix.java-vendor }}8
       - name: Prep for artifact upload
         if: failure()
-        run: rm -rf build-logic/build/tmp
+        run: rm -rf build-logic-ncj/build/tmp
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

bufr/build.gradle.kts

@@ -4,8 +4,8 @@
  */
 
 plugins {
-  id("java-library-conventions")
-  id("protobuf-conventions")
+  id("ncj-java-library-conventions")
+  id("ncj-protobuf-conventions")
 }
 
 description = "Reading BUFR files with the NetCDF-java library."
@@ -17,22 +17,22 @@ dependencies {
 
   api(project(":cdm-core"))
 
-  implementation(libs.beust.jcommander)
-  implementation(libs.findbugs.jsr305)
-  implementation(libs.guava)
-  implementation(libs.jdom2)
-  implementation(libs.protobuf)
-  implementation(libs.re2j)
-  implementation(libs.slf4j.api)
+  implementation(ncjLibs.beust.jcommander)
+  implementation(ncjLibs.findbugs.jsr305)
+  implementation(ncjLibs.guava)
+  implementation(ncjLibs.jdom2)
+  implementation(ncjLibs.protobuf)
+  implementation(ncjLibs.re2j)
+  implementation(ncjLibs.slf4j.api)
 
   testImplementation(platform(project(":netcdf-java-testing-platform")))
 
   testImplementation(project(":cdm-test-utils"))
 
-  testImplementation(libs.google.truth)
+  testImplementation(ncjLibs.google.truth)
 
-  testCompileOnly(libs.junit4)
+  testCompileOnly(ncjLibs.junit4)
 
-  testRuntimeOnly(libs.junit5.platformLauncher)
-  testRuntimeOnly(libs.junit5.vintageEngine)
+  testRuntimeOnly(ncjLibs.junit5.platformLauncher)
+  testRuntimeOnly(ncjLibs.junit5.vintageEngine)
 }

build-logic/build.gradle.kts → build-logic-ncj/build.gradle.kts

@@ -5,13 +5,13 @@
 
 plugins {
   `kotlin-dsl`
-  alias(libs.plugins.protobuf)
-  alias(libs.plugins.spotless)
+  alias(ncjLibs.plugins.protobuf)
+  alias(ncjLibs.plugins.spotless)
 }
 
 dependencies {
-  implementation(plugin(libs.plugins.protobuf))
-  implementation(plugin(libs.plugins.spotless))
+  implementation(plugin(ncjLibs.plugins.protobuf))
+  implementation(plugin(ncjLibs.plugins.spotless))
 }
 
 spotless {

build-logic/settings.gradle.kts → build-logic-ncj/settings.gradle.kts

@@ -9,7 +9,7 @@ dependencyResolutionManagement {
     mavenCentral()
     gradlePluginPortal()
   }
-  versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } }
+  versionCatalogs { create("ncjLibs") { from(files("../gradle/ncj.libs.versions.toml")) } }
 }
 
-rootProject.name = "build-logic"
+rootProject.name = "build-logic-ncj"

build-logic/src/main/kotlin/base-conventions.gradle.kts → build-logic-ncj/src/main/kotlin/ncj-base-conventions.gradle.kts

@@ -9,7 +9,7 @@ val catalogs = extensions.getByType<VersionCatalogsExtension>()
 
 group = "edu.ucar"
 
-version = catalogs.named("libs").findVersion("netcdf-java").get().requiredVersion
+version = catalogs.named("ncjLibs").findVersion("netcdf-java").get().requiredVersion
 
 description = "A component to the Unidata netCDF-Java library (aka CDM)."
 
@@ -62,5 +62,5 @@ project.extra["public.artifacts"] = publicArtifacts
 // will be the bytecode produced by the project for all java compilation
 // will be used to run the tests (test, not testWithJdkX), generate code coverage reports, etc.
 // other versions of java can be used to run the tests, but this is configured in
-// testing-conventions.gradle.kts
+// ncj-testing-conventions.gradle.kts
 project.extra["project.minimumJdkVersion"] = "8"

build-logic/src/main/kotlin/java-base-conventions.gradle.kts → build-logic-ncj/src/main/kotlin/ncj-java-base-conventions.gradle.kts

@@ -4,8 +4,8 @@
  */
 
 plugins {
-  id("base-conventions")
-  id("testing-conventions")
+  id("ncj-base-conventions")
+  id("ncj-testing-conventions")
 }
 
 tasks {

build-logic/src/main/kotlin/java-library-conventions.gradle.kts → build-logic-ncj/src/main/kotlin/ncj-java-library-conventions.gradle.kts

@@ -4,9 +4,9 @@
  */
 
 plugins {
-  id("java-base-conventions")
+  id("ncj-java-base-conventions")
   `java-library`
-  id("artifact-publishing-conventions")
+  id("ncj-artifact-publishing-conventions")
   id("com.diffplug.spotless")
 }
 

build-logic/src/main/kotlin/platform-conventions.gradle.kts → build-logic-ncj/src/main/kotlin/ncj-platform-conventions.gradle.kts

@@ -7,9 +7,9 @@ import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.create
 
 plugins {
-  id("base-conventions")
+  id("ncj-base-conventions")
   `java-platform`
-  id("artifact-publishing-conventions")
+  id("ncj-artifact-publishing-conventions")
 }
 
 publishing {

build-logic/src/main/kotlin/protobuf-conventions.gradle.kts → build-logic-ncj/src/main/kotlin/ncj-protobuf-conventions.gradle.kts

@@ -4,13 +4,13 @@
  */
 
 plugins {
-  id("java-base-conventions")
+  id("ncj-java-base-conventions")
   id("com.google.protobuf")
 }
 
-val libs = extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
+val libCatalog = extensions.getByType(VersionCatalogsExtension::class.java).named("ncjLibs")
 
-protobuf.protoc { artifact = libs.findLibrary("protobuf-protoc").get().get().toString() }
+protobuf.protoc { artifact = libCatalog.findLibrary("protobuf-protoc").get().get().toString() }
 
 tasks.withType(JacocoReport::class.java).configureEach {
   classDirectories.setFrom(

build-logic/src/main/kotlin/testing-conventions.gradle.kts → build-logic-ncj/src/main/kotlin/ncj-testing-conventions.gradle.kts

@@ -4,7 +4,7 @@
  */
 
 plugins {
-  id("base-conventions")
+  id("ncj-base-conventions")
   java
   jacoco
 }

build.gradle.kts

@@ -4,8 +4,8 @@
  */
 
 plugins {
-  id("java-base-conventions")
-  alias(libs.plugins.spotless)
+  id("ncj-java-base-conventions")
+  alias(ncjLibs.plugins.spotless)
 }
 
 description = "The Unidata netCDF-Java library (aka CDM)."
@@ -19,10 +19,10 @@ tasks.wrapper {
 }
 
 spotless {
-  // check all gradle build scripts (build-logic has its own formatting check)
+  // check all gradle build scripts (build-logic-ncj has its own formatting check)
   kotlinGradle {
     target("*.gradle.kts", "**/*.gradle.kts")
-    targetExclude("build-logic/**/*")
+    targetExclude("build-logic-ncj/**/*")
     ktfmt().googleStyle()
   }
 }

cdm-test-utils/build.gradle.kts

@@ -3,7 +3,7 @@
  * See LICENSE for license information.
  */
 
-plugins { id("java-library-conventions") }
+plugins { id("ncj-java-library-conventions") }
 
 description =
   "A collection of reusable classes to be used internally for testing across the various THREDDS projects."
@@ -17,11 +17,11 @@ dependencies {
 
   implementation(project(":httpservices"))
 
-  implementation(libs.jdom2)
-  implementation(libs.junit4)
-  implementation(libs.re2j)
-  implementation(libs.slf4j.api)
-  implementation(libs.testcontainers)
+  implementation(ncjLibs.jdom2)
+  implementation(ncjLibs.junit4)
+  implementation(ncjLibs.re2j)
+  implementation(ncjLibs.slf4j.api)
+  implementation(ncjLibs.testcontainers)
 }
 
 tasks.withType<Jar>().configureEach {

cdm-test/build.gradle.kts

@@ -5,7 +5,7 @@ import kotlin.collections.set
  * See LICENSE for license information.
  */
 
-plugins { id("java-base-conventions") }
+plugins { id("ncj-java-base-conventions") }
 
 description =
   "Classes for CDM unit and integration testing. Relies on having access to " +
@@ -25,21 +25,21 @@ dependencies {
   testImplementation(project(":netcdf4"))
   testImplementation(project(":udunits"))
 
-  testImplementation(libs.awssdk.s3)
-  testImplementation(libs.commons.compress)
-  testImplementation(libs.commons.io)
-  testImplementation(libs.findbugs.jsr305)
-  testImplementation(libs.google.truth)
-  testImplementation(libs.guava)
-  testImplementation(libs.jdom2)
-  testImplementation(libs.jj2000)
-  testImplementation(libs.re2j)
-  testImplementation(libs.slf4j.api)
-  testCompileOnly(libs.junit4)
+  testImplementation(ncjLibs.awssdk.s3)
+  testImplementation(ncjLibs.commons.compress)
+  testImplementation(ncjLibs.commons.io)
+  testImplementation(ncjLibs.findbugs.jsr305)
+  testImplementation(ncjLibs.google.truth)
+  testImplementation(ncjLibs.guava)
+  testImplementation(ncjLibs.jdom2)
+  testImplementation(ncjLibs.jj2000)
+  testImplementation(ncjLibs.re2j)
+  testImplementation(ncjLibs.slf4j.api)
+  testCompileOnly(ncjLibs.junit4)
 
-  testRuntimeOnly(libs.junit5.platformLauncher)
-  testRuntimeOnly(libs.junit5.vintageEngine)
-  testRuntimeOnly(libs.logback.classic)
+  testRuntimeOnly(ncjLibs.junit5.platformLauncher)
+  testRuntimeOnly(ncjLibs.junit5.vintageEngine)
+  testRuntimeOnly(ncjLibs.logback.classic)
 }
 
 val testVersions = project.extra["project.testLtsVersions"]

cdm/core/build.gradle.kts

@@ -4,8 +4,8 @@
  */
 
 plugins {
-  id("java-library-conventions")
-  id("protobuf-conventions")
+  id("ncj-java-library-conventions")
+  id("ncj-protobuf-conventions")
 }
 
 description =
@@ -20,29 +20,29 @@ dependencies {
   implementation(project(":httpservices"))
   implementation(project(":udunits"))
 
-  implementation(libs.beust.jcommander)
-  implementation(libs.commons.math3)
-  implementation(libs.findbugs.jsr305)
-  implementation(libs.guava)
-  implementation(libs.jdom2)
-  implementation(libs.jodaTime)
-  implementation(libs.protobuf)
-  implementation(libs.re2j)
-  implementation(libs.slf4j.api)
+  implementation(ncjLibs.beust.jcommander)
+  implementation(ncjLibs.commons.math3)
+  implementation(ncjLibs.findbugs.jsr305)
+  implementation(ncjLibs.guava)
+  implementation(ncjLibs.jdom2)
+  implementation(ncjLibs.jodaTime)
+  implementation(ncjLibs.protobuf)
+  implementation(ncjLibs.re2j)
+  implementation(ncjLibs.slf4j.api)
 
   testImplementation(platform(project(":netcdf-java-testing-platform")))
 
   testImplementation(project(":cdm-test-utils"))
 
-  testImplementation(libs.commons.io)
-  testImplementation(libs.google.truth)
-  testImplementation(libs.mockito.core)
+  testImplementation(ncjLibs.commons.io)
+  testImplementation(ncjLibs.google.truth)
+  testImplementation(ncjLibs.mockito.core)
 
-  testCompileOnly(libs.junit4)
+  testCompileOnly(ncjLibs.junit4)
 
-  testRuntimeOnly(libs.junit5.platformLauncher)
-  testRuntimeOnly(libs.junit5.vintageEngine)
-  testRuntimeOnly(libs.logback.classic)
+  testRuntimeOnly(ncjLibs.junit5.platformLauncher)
+  testRuntimeOnly(ncjLibs.junit5.vintageEngine)
+  testRuntimeOnly(ncjLibs.logback.classic)
 }
 
 tasks.withType<Jar>().configureEach {

cdm/gcdm/build.gradle.kts

@@ -7,10 +7,10 @@ import com.github.psxpaul.task.JavaExecFork
 import com.google.protobuf.gradle.id
 
 plugins {
-  id("java-library-conventions")
+  id("ncj-java-library-conventions")
   application
-  id("protobuf-conventions")
-  alias(libs.plugins.execfork)
+  id("ncj-protobuf-conventions")
+  alias(ncjLibs.plugins.execfork)
 }
 
 description = "gRPC client and server implementation of CDM Remote Procedure Calls (gCDM)."
@@ -22,35 +22,35 @@ dependencies {
 
   api(project(":cdm-core"))
 
-  implementation(libs.grpc.protobuf)
-  implementation(libs.grpc.stub)
-  implementation(libs.slf4j.api)
+  implementation(ncjLibs.grpc.protobuf)
+  implementation(ncjLibs.grpc.stub)
+  implementation(ncjLibs.slf4j.api)
 
-  compileOnly(libs.tomcat.annotationsApi)
+  compileOnly(ncjLibs.tomcat.annotationsApi)
 
   runtimeOnly(project(":bufr"))
   runtimeOnly(project(":grib"))
 
-  runtimeOnly(libs.grpc.nettyShaded)
-  runtimeOnly(libs.logback.classic)
+  runtimeOnly(ncjLibs.grpc.nettyShaded)
+  runtimeOnly(ncjLibs.logback.classic)
 
   testImplementation(platform(project(":netcdf-java-testing-platform")))
 
   testImplementation(project(":cdm-test-utils"))
   testImplementation(project(":netcdf4"))
 
-  testImplementation(libs.commons.io)
-  testImplementation(libs.google.truth)
-  testImplementation(libs.grpc.testing)
-  testImplementation(libs.mockito.core)
+  testImplementation(ncjLibs.commons.io)
+  testImplementation(ncjLibs.google.truth)
+  testImplementation(ncjLibs.grpc.testing)
+  testImplementation(ncjLibs.mockito.core)
 
-  testCompileOnly(libs.junit4)
+  testCompileOnly(ncjLibs.junit4)
 
-  testRuntimeOnly(libs.junit5.platformLauncher)
-  testRuntimeOnly(libs.junit5.vintageEngine)
+  testRuntimeOnly(ncjLibs.junit5.platformLauncher)
+  testRuntimeOnly(ncjLibs.junit5.vintageEngine)
 }
 
-val libCatalog = extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
+val libCatalog = extensions.getByType(VersionCatalogsExtension::class.java).named("ncjLibs")
 
 protobuf {
   protoc { artifact = libCatalog.findLibrary("protobuf-protoc").get().get().toString() }
@@ -80,7 +80,6 @@ val startDaemon =
     jvmArgs = listOf("-Xmx512m", "-Djava.awt.headless=true")
     standardOutput = project.layout.buildDirectory.file("gcdm_logs/gcdm.log")
     errorOutput = project.layout.buildDirectory.file("gcdm_logs/gcdm-error.log")
-    // stopAfter = tasks.named("test")
     waitForPort = 16111
     waitForOutput = "Server started, listening on 16111"
     dependsOn(tasks.testClasses)