From 183a056c101773de6cefee7dda2e4d4607b2edbb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 27 Jan 2015 16:43:01 +0300 Subject: [PATCH] Added workaround for linkage error in IDEA 14.0-14.0.2 Original commit: a6362dda225e8af74e2460d7366a4bc477d4692d --- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 44f30bef277..3c3aa7470ab 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 @@ -162,7 +162,15 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR FSOperations.markDirtyRecursively(context, chunk) } RECOMPILE_OTHERS_WITH_DEPENDANTS -> { - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, fileFilter) + // Workaround for IDEA 14.0-14.0.2: extended version of markDirtyRecursively is not available + try { + Class.forName("org.jetbrains.jps.incremental.fs.CompilationRound") + + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, fileFilter) + } catch (e: ClassNotFoundException) { + allCompiledFiles.clear() + FSOperations.markDirtyRecursively(context, chunk) + } } RECOMPILE_OTHERS_IN_CHUNK -> { FSOperations.markDirty(context, chunk, fileFilter)