From 5028184c2a3949d23648d11b60182c16d7188544 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 5 Feb 2016 14:57:47 +0300 Subject: [PATCH] Minor: remove commented code KT-8487 --- .../jetbrains/kotlin/gradle/tasks/Tasks.kt | 25 ------------------- .../KotlinGradlePluginParametrizedIT.kt | 1 - 2 files changed, 26 deletions(-) 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 1b6110bee70..b78a63c76c2 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 @@ -432,44 +432,21 @@ open class KotlinCompile() : AbstractKotlinCompile() { lookupTracker = lookupTracker) allGeneratedFiles.addAll(generatedFiles) - // save versions? - val changes = updateIncrementalCaches( targets = targets, generatedFiles = generatedFiles, compiledWithErrors = exitCode != ExitCode.OK, getIncrementalCache = { caches[it]!! }) -// lookupTracker.lookups.entrySet().forEach { -// logger.kotlinDebug("lookups to ${it.key.name}:${it.key.scope} from ${it.value.joinToString { projectRelativePath(it) }}") -// } - lookupStorage.update(lookupTracker, sourcesToCompile, currentRemoved) - allCachesVersions().forEach { it.saveIfNeeded() } - processCompilerExitCode(exitCode) if (!isIncrementalDecided) break; -// logger.kotlinDebug("generated ${generatedFiles.joinToString { outputRelativePath(it.outputFile) }}") -// logger.kotlinDebug("changes: ${changes.changes.joinToString { "${it.fqName}: ${it.javaClass.simpleName}" }}") -// -// logger.kotlinLazyDebug({ -// "known lookups:\n${lookupStorage.dump(changes.changes.flatMap { -// change -> -// if (change is ChangeInfo.MembersChanged) -// change.names.asSequence().map { LookupSymbol(it, change.fqName.asString()) } -// else -// sequenceOf() -// }.toSet(), project.projectDir)}" }) - compiledSourcesSet.addAll(sourcesToCompile) val dirtyLookups = changes.dirtyLookups(caches.values.asSequence()) - -// logger.kotlinDebug("dirty lookups: ${dirtyLookups.joinToString { "${it.name}:${it.scope}" }}") - val dirty = dirtyLookups.files( filesFilter = { it !in compiledSourcesSet }, logAction = { lookup, files -> @@ -479,8 +456,6 @@ open class KotlinCompile() : AbstractKotlinCompile() { if (currentRemoved.any()) { currentRemoved = listOf() } -// logger.kotlinDebug("dirty: ${dirty.joinToString { projectRelativePath(it) }}") -// logger.kotlinDebug("to compile: ${sourcesToCompile.joinToString { projectRelativePath(it) }}") } lookupStorage.flush(false) lookupStorage.close() diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt index 405dad3c1f8..9a3ae9c3ab6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginParametrizedIT.kt @@ -42,7 +42,6 @@ class KotlinGradlePluginJpsParametrizedIT : BaseIncrementalGradleIT() { .filter { it.isDirectory && isJpsTestProject(it) } .map { arrayOf(it.toRelativeString(jpsResourcesPath)) } .toList() -// .take(30) @Synchronized fun checkRecycleDaemon() {