Skip to content

Commit bee1fd1

Browse files
committed
Use WriteProperties task and wire srcDir via task provider
Use the built-in Gradle WriteProperties task as suggested by bric3. Instead of splitting the output directory into a separate variable and adding an explicit dependsOn (which bric3 did not suggest), derive the srcDir provider from the task itself via generatePomProperties.map{...}. This way Gradle infers the processResources -> generatePomProperties dependency automatically, without extra boilerplate.
1 parent 4b8febf commit bee1fd1

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

dd-java-agent/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,17 +324,15 @@ def generateAgentJarIndex = tasks.register('generateAgentJarIndex', JavaExec) {
324324
}
325325
sourceSets.main.resources.srcDir(generateAgentJarIndex)
326326

327-
def pomPropertiesOutputDir = project.layout.buildDirectory.dir("generated/maven-metadata")
328327
def generatePomProperties = tasks.register('generatePomProperties', WriteProperties) {
329-
destinationFile = pomPropertiesOutputDir.map { it.file("META-INF/maven/com.datadoghq/dd-java-agent/pom.properties") }
328+
destinationFile = project.layout.buildDirectory.file("generated/maven-metadata/META-INF/maven/com.datadoghq/dd-java-agent/pom.properties")
330329
property("groupId", "com.datadoghq")
331330
property("artifactId", "dd-java-agent")
332331
property("version", project.providers.provider { project.version.toString() })
333332
}
334-
sourceSets.main.resources.srcDir(pomPropertiesOutputDir)
335-
tasks.named("processResources") {
336-
dependsOn(generatePomProperties)
337-
}
333+
sourceSets.main.resources.srcDir(
334+
generatePomProperties.map { project.layout.buildDirectory.dir("generated/maven-metadata").get() }
335+
)
338336

339337
subprojects { Project subProj ->
340338
// Don't need javadoc task run for internal projects.

0 commit comments

Comments
 (0)