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

Migrating to IDEA 123.4

Browse Source 
Original commit: 3b11d5787c
This commit is contained in:
Andrey Breslav
2012-11-23 12:17:54 +04:00
parent 1f1b323ec1
commit f0c15286c1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/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()));
} }