Skip to content

Commit cbe680d

Browse files
Move file utils
Fixing IC after moving it from Gradle to the compiler in commit f40a3ef
1 parent 8bd8f5e commit cbe680d

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ fun <Target> mapClassesFqNamesToFiles(
255255
return dirtyFiles
256256
}
257257

258-
private fun File.isJavaFile() = extension.equals(JavaFileType.INSTANCE.defaultExtension, ignoreCase = true)
259-
260258
private fun findSrcDirRoot(file: File, roots: Iterable<File>): File? =
261259
roots.firstOrNull { FileUtil.isAncestor(it, file, false) }
262260

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,14 @@ package org.jetbrains.kotlin.incremental
1818

1919
import java.io.File
2020

21-
internal fun File.isJavaFile() =
21+
fun File.isJavaFile() =
2222
extension.equals("java", ignoreCase = true)
2323

24-
internal fun File.isKotlinFile(): Boolean =
24+
fun File.isKotlinFile(): Boolean =
2525
extension.let {
2626
"kt".equals(it, ignoreCase = true) ||
2727
"kts".equals(it, ignoreCase = true)
2828
}
2929

30-
internal fun File.isClassFile(): Boolean =
30+
fun File.isClassFile(): Boolean =
3131
extension.equals("class", ignoreCase = true)
32-
33-
internal fun listClassFiles(path: String): Sequence<File> =
34-
File(path).walk().filter { it.isFile && it.isClassFile() }
35-
36-
internal fun File.relativeOrCanonical(base: File): String =
37-
relativeToOrNull(base)?.path ?: canonicalPath
38-
39-
internal fun Iterable<File>.pathsAsStringRelativeTo(base: File): String =
40-
map { it.relativeOrCanonical(base) }.sorted().joinToString()

0 commit comments

Comments
 (0)