From 3b11d5787c3a33d85104bb81780efcbb4ba857b0 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 23 Nov 2012 12:17:54 +0400
Subject: [PATCH] Migrating to IDEA 123.4

---
 idea/src/META-INF/plugin.xml                              | 2 +-
 .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java    | 5 ++---
 update_dependencies.xml                                   | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

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 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
-  <idea-version since-build="122.813" until-build="122.9999" />
+  <idea-version since-build="123.4" until-build="123.9999" />
 
   <depends optional="true">JUnit</depends>
 
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<JavaSourceRootDescriptor, ModuleBuildTarget> 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 @@
 
     <target name="update" depends="fetch-third-party">
         <execute_update
-            base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt343/71935:id"
-            build.zip="ideaIC-122.SNAPSHOT.win.zip"
+            base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt410/72290:id"
+            build.zip="ideaIC-123.SNAPSHOT.win.zip"
         />
     </target>
 
     <target name="jb_update" depends="fetch-third-party">
         <execute_update
-            base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt662/1625050:id"
-            build.zip="ideaIC-122.SNAPSHOT.win.zip"
+            base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt3446/1634820:id"
+            build.zip="ideaIC-123.SNAPSHOT.win.zip"
         />
     </target>