diff --git a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt index c000fef56e0..312f14c5d1a 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt @@ -255,8 +255,6 @@ fun mapClassesFqNamesToFiles( return dirtyFiles } -private fun File.isJavaFile() = extension.equals(JavaFileType.INSTANCE.defaultExtension, ignoreCase = true) - private fun findSrcDirRoot(file: File, roots: Iterable): File? = roots.firstOrNull { FileUtil.isAncestor(it, file, false) } diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/fileUtils.kt b/build-common/src/org/jetbrains/kotlin/incremental/fileUtils.kt similarity index 63% rename from compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/fileUtils.kt rename to build-common/src/org/jetbrains/kotlin/incremental/fileUtils.kt index 0129e427e03..459ae02d2e2 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/fileUtils.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/fileUtils.kt @@ -18,23 +18,14 @@ package org.jetbrains.kotlin.incremental import java.io.File -internal fun File.isJavaFile() = +fun File.isJavaFile() = extension.equals("java", ignoreCase = true) -internal fun File.isKotlinFile(): Boolean = +fun File.isKotlinFile(): Boolean = extension.let { "kt".equals(it, ignoreCase = true) || "kts".equals(it, ignoreCase = true) } -internal fun File.isClassFile(): Boolean = +fun File.isClassFile(): Boolean = extension.equals("class", ignoreCase = true) - -internal fun listClassFiles(path: String): Sequence = - File(path).walk().filter { it.isFile && it.isClassFile() } - -internal fun File.relativeOrCanonical(base: File): String = - relativeToOrNull(base)?.path ?: canonicalPath - -internal fun Iterable.pathsAsStringRelativeTo(base: File): String = - map { it.relativeOrCanonical(base) }.sorted().joinToString()