From 7d5158c4396811032d7140ba515be87164f21ac2 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 31 Jan 2019 17:07:03 +0300 Subject: [PATCH] Build: Fix internal api usage in DistModelBuilder MapFileTree interface changed in gradle 5.1 --- buildSrc/src/main/kotlin/idea/DistModelBuilder.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/idea/DistModelBuilder.kt b/buildSrc/src/main/kotlin/idea/DistModelBuilder.kt index 0c313e494a0..0f206083826 100755 --- a/buildSrc/src/main/kotlin/idea/DistModelBuilder.kt +++ b/buildSrc/src/main/kotlin/idea/DistModelBuilder.kt @@ -30,6 +30,7 @@ import org.gradle.api.tasks.SourceSetOutput import org.gradle.api.tasks.Sync import org.gradle.api.tasks.bundling.AbstractArchiveTask import org.gradle.api.tasks.compile.AbstractCompile +import org.gradle.api.tasks.util.PatternSet import org.gradle.internal.file.PathToFileResolver import org.gradle.jvm.tasks.Jar import java.io.File @@ -163,7 +164,7 @@ open class DistModelBuilder(val rootProject: Project, pw: PrintWriter) { } }) } - sourcePath is FileTreeAdapter && sourcePath.tree is MapFileTree -> ctx.child("FILE TREE ADAPTER OF MAP FILE TREE (${sourcePath.javaClass.simpleName})") { child -> + sourcePath is FileTreeAdapter && sourcePath.tree is GeneratedSingletonFileTree -> ctx.child("FILE TREE ADAPTER OF MAP FILE TREE (${sourcePath.javaClass.simpleName})") { child -> sourcePath.visitContents(object : FileCollectionResolveContext { override fun add(element: Any): FileCollectionResolveContext { processSourcePath(element, child) @@ -181,9 +182,9 @@ open class DistModelBuilder(val rootProject: Project, pw: PrintWriter) { } sourcePath is CompositeFileCollection -> ctx.child("COMPOSITE FILE COLLECTION") { child -> sourcePath.visitLeafCollections(object : FileCollectionLeafVisitor { - override fun visitDirectoryTree(directoryTree: DirectoryFileTree) { - child.child("DIR TREE") { - it.addCopyOf(directoryTree.dir.path) + override fun visitFileTree(file: File, patternSet: PatternSet) { + child.child("FILE TREE") { + it.addCopyOf(file.path) } }