Skip to content

Commit 5833711

Browse files
committed
Better support for gradle composite builds
Make the gradle build-logic composite build (and other build aspects) more unique to better support composite builds. This is useful for linking and debugging netCDF-Java issues through other projects, like the TDS. These changes are basically internal renaming operations, and should not impact any of the commands used to assemble the project.
1 parent 4104579 commit 5833711

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spotless {
2222
// check all gradle build scripts (build-logic has its own formatting check)
2323
kotlinGradle {
2424
target("*.gradle.kts", "**/*.gradle.kts")
25-
targetExclude("build-logic/**/*")
25+
targetExclude("build-logic-ncj/**/*")
2626
ktfmt().googleStyle()
2727
}
2828
}

docs/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ val buildJavadocAll =
9999

100100
title = "NetCDF-Java All API v${version}"
101101
destinationDir = layout.buildDirectory.dir("javadocAll").get().asFile
102-
// list of public artifacts managed by build-logic/src/main/kotlin/ncj-base-conventions.gradle.kts
102+
// list of public artifacts managed by
103+
// build-logic/src/main/kotlin/ncj-base-conventions.gradle.kts
103104
val publicArtifacts = project.extra.get("public.artifacts")
104105
if (publicArtifacts is List<*>) {
105106
publicArtifacts.forEach {

gradle/ncj.libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ execfork = { id = "com.github.psxpaul.execfork", version = "0.2.2"}
117117
javacc = { id = "org.javacc.javacc", version = "4.0.1" }
118118
protobuf = { id = "com.google.protobuf", version = "0.9.5" }
119119
shadow = { id = "com.gradleup.shadow", version = "9.3.1" }
120-
spotless = { id = "com.diffplug.spotless", version = "8.0.0" }
120+
spotless = { id = "com.diffplug.spotless", version = "8.2.1" }

netcdf-java-bom/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ extra["project.title"] = "netCDF-Java BOM"
1111

1212
dependencies {
1313
constraints {
14-
// list of public artifacts managed by build-logic/src/main/kotlin/ncj-base-conventions.gradle.kts
14+
// list of public artifacts managed by
15+
// build-logic/src/main/kotlin/ncj-base-conventions.gradle.kts
1516
val publicArtifacts = project.extra.get("public.artifacts")
1617
if (publicArtifacts is List<*>) {
1718
publicArtifacts.forEach { api(project(it.toString())) }

0 commit comments

Comments
 (0)