From 9422d8292481ee49d3d2271dd1230596e332319d Mon Sep 17 00:00:00 2001 From: David Wheeler Date: Tue, 4 Jun 2024 09:36:07 +1000 Subject: [PATCH] Make the gitPublish task depend directly on the other tasks (vs the folders) to make Gradle aware of the task dependencies (#602) --- documentation/build.gradle.kts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/build.gradle.kts b/documentation/build.gradle.kts index d89671edc..7a21cbdc8 100644 --- a/documentation/build.gradle.kts +++ b/documentation/build.gradle.kts @@ -36,9 +36,9 @@ tasks { } } - rootProject.subprojects.filter { project != it }.forEach { project -> + rootProject.subprojects.filter { project != it }.forEach { otherProject -> - project.tasks.withType(Javadoc::class.java).forEach { task -> + otherProject.tasks.withType(Javadoc::class.java).forEach { task -> dependsOn(task) source += task.source classpath += task.classpath @@ -119,17 +119,17 @@ tasks { branch.set("gh-pages") contents { - from("$buildDir/docs/html5") { + from(asciidoctor) { into("docs/$version") } - from ("$buildDir/javadoc") { + from (aggregateJavadocs) { into("docs/$version/javadoc") } if (!isSnapshot) { - from("$buildDir/docs/html5") { + from(asciidoctor) { into("docs/current") } - from ("$buildDir/javadoc") { + from (aggregateJavadocs) { into("docs/current/javadoc") } }