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

Minor. Renamed and cleaned CompilerServices -> Services.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-08-20 13:45:52 +04:00
parent 69c31c00db
commit 487f381287
9 changed files with 33 additions and 35 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
+2 -2
View File
@@ -28,7 +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
import org.jetbrains.jet.config.Services
public open class KotlinCompile(): AbstractCompile() {
@@ -123,7 +123,7 @@ public open class KotlinCompile(): AbstractCompile() {
val messageCollector = GradleMessageCollector(getLogger())
getLogger().debug("Calling compiler")
val exitCode = compiler.exec(messageCollector, CompilerServices.empty, args)
val exitCode = compiler.exec(messageCollector, Services.EMPTY, args)
when (exitCode) {
ExitCode.COMPILATION_ERROR -> throw GradleException("Compilation error. See log for more details")
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+2 -2
View File
@@ -35,7 +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 org.jetbrains.jet.config.Services;
import java.io.File;
import java.io.IOException;
@@ -260,7 +260,7 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
@NotNull CommonCompilerArguments arguments,
@NotNull MessageCollector messageCollector
) {
return compiler.exec(messageCollector, CompilerServices.OBJECT$.getEmpty(), arguments);
return compiler.exec(messageCollector, Services.EMPTY, arguments);
}
/**