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

Log version in JPS plugin

Browse Source 
CompilerVersion.java is moved to cli-common (shared between compiler and JPS plugin) and renamed to KotlinVersion

This is needed because on TeamCity a JPS plugin is configured separately from the compiler, so it may happen that
JPS plugin version X tries to run compiler version X+100, and causes trouble.

Original commit: 387bf2601b
This commit is contained in:
Andrey Breslav
2013-07-25 15:51:23 +04:00
parent 30ce814129
commit eba00a0cd9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+4 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.Function; import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.KotlinVersion;
import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.cli.common.messages.MessageCollector;
@@ -39,6 +40,7 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION;
import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.INFO;
import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING;
public class KotlinBuilder extends ModuleLevelBuilder { public class KotlinBuilder extends ModuleLevelBuilder {
@@ -69,9 +71,10 @@ public class KotlinBuilder extends ModuleLevelBuilder {
DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder, DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder,
OutputConsumer outputConsumer OutputConsumer outputConsumer
) throws ProjectBuildException, IOException { ) throws ProjectBuildException, IOException {
MessageCollector messageCollector = new MessageCollectorAdapter(context); MessageCollector messageCollector = new MessageCollectorAdapter(context);
messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION);
if (chunk.getModules().size() > 1) { if (chunk.getModules().size() > 1) {
// We do not support circular dependencies, but if they are present, we should not break the build, // We do not support circular dependencies, but if they are present, we should not break the build,
// so we simply yield a warning and report NOTHING_DONE // so we simply yield a warning and report NOTHING_DONE