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

Fixed gradle and maven plugins after changing compiler API.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-08-20 13:35:08 +04:00
parent fe27b2264a
commit 69c31c00db
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+3 -2
View File
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.doc.KDocConfig import org.jetbrains.kotlin.doc.KDocConfig
import java.util.concurrent.Callable import java.util.concurrent.Callable
import org.gradle.api.Project import org.gradle.api.Project
import org.jetbrains.jet.config.CompilerServices
public open class KotlinCompile(): AbstractCompile() { public open class KotlinCompile(): AbstractCompile() {
@@ -122,7 +123,7 @@ public open class KotlinCompile(): AbstractCompile() {
val messageCollector = GradleMessageCollector(getLogger()) val messageCollector = GradleMessageCollector(getLogger())
getLogger().debug("Calling compiler") getLogger().debug("Calling compiler")
val exitCode = compiler.exec(messageCollector, args) val exitCode = compiler.exec(messageCollector, CompilerServices.empty, args)
when (exitCode) { when (exitCode) {
ExitCode.COMPILATION_ERROR -> throw GradleException("Compilation error. See log for more details") 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 compiler = KDocCompiler()
val messageCollector = GradleMessageCollector(getLogger()) val messageCollector = GradleMessageCollector(getLogger())
val exitCode = compiler.exec(messageCollector, args); val exitCode = compiler.exec(messageCollector, CompilerServices.empty, args);
when (exitCode) { when (exitCode) {
ExitCode.COMPILATION_ERROR -> throw GradleException("Failed to generate kdoc. See log for more details") ExitCode.COMPILATION_ERROR -> throw GradleException("Failed to generate kdoc. See log for more details")
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+2 -1
View File
@@ -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.CompilerMessageSeverity;
import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.cli.jvm.K2JVMCompiler; import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
import org.jetbrains.jet.config.CompilerServices;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -259,7 +260,7 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
@NotNull CommonCompilerArguments arguments, @NotNull CommonCompilerArguments arguments,
@NotNull MessageCollector messageCollector @NotNull MessageCollector messageCollector
) { ) {
return compiler.exec(messageCollector, arguments); return compiler.exec(messageCollector, CompilerServices.OBJECT$.getEmpty(), arguments);
} }
/** /**