From dbe85daeac4be7012e047494a984d22dcec4450f Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 30 Jun 2015 17:48:34 +0300 Subject: [PATCH] Move CompilationCanceledStatus and related utils to "util" module It should not be in "frontend" since "jps bare plugin" artifact does not include "frontend" module Original commit: 15a4782a0c4cdc22d66fd150ad1a2eaada153dce --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 84a21e24908..5c120c79331 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -48,8 +48,8 @@ import org.jetbrains.kotlin.config.CompilerRunnerConstants import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services -import org.jetbrains.kotlin.context.CompilationCanceledStatus -import org.jetbrains.kotlin.context.CompilationCanceledException +import org.jetbrains.kotlin.progress.CompilationCanceledStatus +import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING @@ -282,8 +282,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.cache.") || className == "org.jetbrains.kotlin.config.Services" || className.startsWith("org.apache.log4j.") // For logging from compiler - || className == "org.jetbrains.kotlin.context.CompilationCanceledStatus" - || className == "org.jetbrains.kotlin.context.CompilationCanceledException" + || className == "org.jetbrains.kotlin.progress.CompilationCanceledStatus" + || className == "org.jetbrains.kotlin.progress.CompilationCanceledException" }, compilerServices )