From f2cde80aaf959d7935e8df7e320bd8bcf76963a5 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 11 Feb 2016 20:36:03 +0300 Subject: [PATCH] Minor: remove unused functions KT-8487 --- .../gradle/tasks/GradleIncrementalCacheImpl.kt | 3 --- .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 13 ------------- .../org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 12 ------------ 3 files changed, 28 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt index c3abd7ab4f9..be5dac7f27e 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt @@ -38,9 +38,6 @@ class GradleIncrementalCacheImpl(targetDataRoot: File, targetOutputDir: File?, t private val sourceToClassfilesMap = registerMap(SourceToClassfilesMap(SOURCES_TO_CLASSFILES.storageFile)) - fun classfilesBySources(sources: Iterable): Iterable = - sources.flatMap { sourceToClassfilesMap[it] } - fun removeClassfilesBySources(sources: Iterable): Unit = sources.forEach { sourceToClassfilesMap.remove(it) } diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 355719b14fc..8f4e15c72c9 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -104,13 +104,6 @@ abstract class AbstractKotlinCompile() : AbstractCo private fun getKotlinSources(): List = (getSource() as Iterable).filter { it.isKotlinFile() } - protected fun File.isClassFile(): Boolean { - return when (FilenameUtils.getExtension(name).toLowerCase()) { - "class" -> true - else -> false - } - } - protected fun File.isKotlinFile(): Boolean { return when (FilenameUtils.getExtension(name).toLowerCase()) { "kt", "kts" -> true @@ -160,7 +153,6 @@ open class KotlinCompile() : AbstractKotlinCompile() { ) fun projectRelativePath(f: File) = f.toRelativeString(project.projectDir) - fun projectRelativePath(p: String) = File(p).toRelativeString(project.projectDir) override fun populateTargetSpecificArgs(args: K2JVMCompilerArguments) { // show kotlin compiler where to look for java source files @@ -694,8 +686,3 @@ internal fun Logger.kotlinInfo(message: String) { internal fun Logger.kotlinDebug(message: String) { this.debug("[KOTLIN] $message") } - -internal fun Logger.kotlinLazyDebug(makeMessage: () -> String) { - if (this.isInfoEnabled) - kotlinDebug(makeMessage()) -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index dd24c545c30..ad412efecf5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -114,14 +114,6 @@ abstract class BaseGradleIT { runAndCheck(cmd, check) } - - fun Project.stopDaemon(check: CompiledProject.() -> Unit) { - val cmd = createGradleCommand(arrayListOf("-stop")) - println("<=== Stop daemon: $cmd ===>") - - runAndCheck(cmd, check) - } - private fun Project.runAndCheck(cmd: List, check: CompiledProject.() -> Unit) { val projectDir = File(workingDir, projectName) if (!projectDir.exists()) @@ -206,16 +198,12 @@ abstract class BaseGradleIT { else assertSameFiles(sources, compiledKotlinSources.projectRelativePaths(this.project), "Compiled Kotlin files differ:\n ") - fun CompiledProject.assertCompiledKotlinSources(vararg sources: String, weakTesting: Boolean = false): CompiledProject = assertCompiledKotlinSources(sources.asIterable(), weakTesting) - fun CompiledProject.assertCompiledJavaSources(sources: Iterable, weakTesting: Boolean = false): CompiledProject = if (weakTesting) assertContainFiles(sources, compiledJavaSources.projectRelativePaths(this.project), "Compiled Java files differ:\n ") else assertSameFiles(sources, compiledJavaSources.projectRelativePaths(this.project), "Compiled Java files differ:\n ") - fun CompiledProject.assertCompiledJavaSources(vararg sources: String, weakTesting: Boolean = false): CompiledProject = assertCompiledJavaSources(sources.asIterable(), weakTesting) - private fun Project.createBuildCommand(params: Array, options: BuildOptions): List = createGradleCommand(createGradleTailParameters(options, params))