diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 13d83892ece..79c3dcafee2 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
@snapshot@
JetBrains Inc.
-
+
JUnit
diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
index 97ab73404b0..7ddf44dedc9 100644
--- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
@@ -24,7 +24,6 @@ import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.compiler.runner.*;
import org.jetbrains.jet.utils.PathUtil;
import org.jetbrains.jps.ModuleChunk;
-import org.jetbrains.jps.builders.ChunkBuildOutputConsumer;
import org.jetbrains.jps.builders.DirtyFilesHolder;
import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor;
import org.jetbrains.jps.incremental.*;
@@ -58,7 +57,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
CompileContext context,
ModuleChunk chunk,
DirtyFilesHolder dirtyFilesHolder,
- ChunkBuildOutputConsumer outputConsumer
+ OutputConsumer outputConsumer
) throws ProjectBuildException, IOException {
MessageCollector messageCollector = new MessageCollectorAdapter(context);
@@ -104,7 +103,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) {
outputConsumer.registerOutputFile(
representativeTarget,
- outputItem.getOutputFile().getPath(),
+ outputItem.getOutputFile(),
paths(outputItem.getSourceFiles()));
}
diff --git a/update_dependencies.xml b/update_dependencies.xml
index b0ec711cc47..0b87e760fec 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -3,15 +3,15 @@