This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch danielsun/tweak-dist in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 56a9a16f53e285132a077d2884a498287201b520 Author: Daniel Sun <[email protected]> AuthorDate: Sat Sep 18 21:16:32 2021 +0800 Fix the failing dist build --- build.gradle | 6 ++++-- buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle | 2 ++ buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7507b67..15a566d 100644 --- a/build.gradle +++ b/build.gradle @@ -181,8 +181,10 @@ configurations { } } -tasks.withType(AbstractCopyTask).configureEach { - it.duplicatesStrategy = DuplicatesStrategy.WARN +allprojects { + tasks.withType(AbstractCopyTask).configureEach { + it.duplicatesStrategy = DuplicatesStrategy.WARN + } } tasks.named('jar') { diff --git a/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle b/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle index 07d8c19..aa55870 100644 --- a/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle +++ b/buildSrc/src/main/groovy/org.apache.groovy-asciidoctor.gradle @@ -53,6 +53,8 @@ asciidoctor { } outputDir = "$buildDir/asciidoc/html5" resources { + duplicatesStrategy = DuplicatesStrategy.WARN + from("${rootProject.projectDir}/src/spec/doc/assets") { include 'css/style.css' } diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy b/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy index ee16fda..56112a0 100644 --- a/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy +++ b/buildSrc/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy @@ -23,6 +23,7 @@ import groovy.transform.CompileStatic import org.gradle.api.DefaultTask import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.DirectoryProperty +import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.file.FileSystemOperations import org.gradle.api.provider.ListProperty import org.gradle.api.tasks.CacheableTask @@ -82,6 +83,8 @@ class DocGDK extends DefaultTask { ) } fs.copy { + duplicatesStrategy = DuplicatesStrategy.WARN + into outputDirectory from resources }
