azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrating to IDEA 123.4

Browse Source
This commit is contained in:
Andrey Breslav
2012-11-23 12:17:54 +04:00
parent 9d3907ff98
commit 3b11d5787c
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<version>@snapshot@</version> <version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor> <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> <depends optional="true">JUnit</depends>
jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+2 -3
View File
@@ -24,7 +24,6 @@ import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.compiler.runner.*; import org.jetbrains.jet.compiler.runner.*;
import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jet.utils.PathUtil;
import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.ModuleChunk;
import org.jetbrains.jps.builders.ChunkBuildOutputConsumer;
import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.DirtyFilesHolder;
import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor;
import org.jetbrains.jps.incremental.*; import org.jetbrains.jps.incremental.*;
@@ -58,7 +57,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
CompileContext context, CompileContext context,
ModuleChunk chunk, ModuleChunk chunk,
DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder, DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder,
ChunkBuildOutputConsumer outputConsumer OutputConsumer outputConsumer
) throws ProjectBuildException, IOException { ) throws ProjectBuildException, IOException {
MessageCollector messageCollector = new MessageCollectorAdapter(context); MessageCollector messageCollector = new MessageCollectorAdapter(context);
@@ -104,7 +103,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) {
outputConsumer.registerOutputFile( outputConsumer.registerOutputFile(
representativeTarget, representativeTarget,
outputItem.getOutputFile().getPath(), outputItem.getOutputFile(),
paths(outputItem.getSourceFiles())); paths(outputItem.getSourceFiles()));
} }
update_dependencies.xml
+4 -4
View File
@@ -3,15 +3,15 @@
<target name="update" depends="fetch-third-party"> <target name="update" depends="fetch-third-party">
<execute_update <execute_update
base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt343/71935:id" base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt410/72290:id"
build.zip="ideaIC-122.SNAPSHOT.win.zip" build.zip="ideaIC-123.SNAPSHOT.win.zip"
/> />
</target> </target>
<target name="jb_update" depends="fetch-third-party"> <target name="jb_update" depends="fetch-third-party">
<execute_update <execute_update
base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt662/1625050:id" base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt3446/1634820:id"
build.zip="ideaIC-122.SNAPSHOT.win.zip" build.zip="ideaIC-123.SNAPSHOT.win.zip"
/> />
</target> </target>