From 69c31c00db2bb93f6012b39e70567933e6609154 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 20 Aug 2014 13:35:08 +0400
Subject: [PATCH] Fixed gradle and maven plugins after changing compiler API.

---
 .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt   | 5 +++--
 .../org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java    | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index c0f733b4ffb..6e677f32bf9 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.doc.KDocConfig
 import java.util.concurrent.Callable
 import org.gradle.api.Project
+import org.jetbrains.jet.config.CompilerServices
 
 public open class KotlinCompile(): AbstractCompile() {
 
@@ -122,7 +123,7 @@ public open class KotlinCompile(): AbstractCompile() {
 
         val messageCollector = GradleMessageCollector(getLogger())
         getLogger().debug("Calling compiler")
-        val exitCode = compiler.exec(messageCollector, args)
+        val exitCode = compiler.exec(messageCollector, CompilerServices.empty, args)
 
         when (exitCode) {
             ExitCode.COMPILATION_ERROR -> throw GradleException("Compilation error. See log for more details")
@@ -188,7 +189,7 @@ public open class KDoc(): SourceTask() {
         val compiler = KDocCompiler()
 
         val messageCollector = GradleMessageCollector(getLogger())
-        val exitCode = compiler.exec(messageCollector, args);
+        val exitCode = compiler.exec(messageCollector, CompilerServices.empty, args);
 
         when (exitCode) {
             ExitCode.COMPILATION_ERROR -> throw GradleException("Failed to generate kdoc. See log for more details")
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
index fe5aff493ca..7c168f9fa90 100644
--- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
@@ -35,6 +35,7 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
 import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
 import org.jetbrains.jet.cli.common.messages.MessageCollector;
 import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
+import org.jetbrains.jet.config.CompilerServices;
 
 import java.io.File;
 import java.io.IOException;
@@ -259,7 +260,7 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
             @NotNull CommonCompilerArguments arguments,
             @NotNull MessageCollector messageCollector
     ) {
-        return compiler.exec(messageCollector, arguments);
+        return compiler.exec(messageCollector, CompilerServices.OBJECT$.getEmpty(), arguments);
     }
 
     /**