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

Minor: rename CompilationResultSink->CompilationResults

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-01-13 13:06:05 +03:00
parent bdae0b5efb
commit 3d07c40887
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResultsSink.kt → libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResults.kt
+3 -3
View File
@@ -2,7 +2,7 @@ package org.jetbrains.kotlin.compilerRunner
import org.gradle.api.Project
import org.jetbrains.kotlin.daemon.common.CompilationResultCategory
import org.jetbrains.kotlin.daemon.common.CompilationResultsSink
import org.jetbrains.kotlin.daemon.common.CompilationResults
import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
import org.jetbrains.kotlin.daemon.report.CompileIterationResult
import org.jetbrains.kotlin.gradle.plugin.kotlinDebug
@@ -11,12 +11,12 @@ import java.io.Serializable
import java.rmi.RemoteException
import java.rmi.server.UnicastRemoteObject
internal class GradleCompilationResultsSink(project: Project): CompilationResultsSink, UnicastRemoteObject(SOCKET_ANY_FREE_PORT) {
internal class GradleCompilationResults(project: Project): CompilationResults, UnicastRemoteObject(SOCKET_ANY_FREE_PORT) {
private val log = project.logger
private val projectRootFile = project.rootProject.projectDir
@Throws(RemoteException::class)
override fun push(compilationResultCategory: Int, value: Serializable) {
override fun add(compilationResultCategory: Int, value: Serializable) {
if (compilationResultCategory == CompilationResultCategory.IC_COMPILE_ITERATION.code) {
@Suppress("UNCHECKED_CAST")
val compileIterationResult = value as? CompileIterationResult
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+2 -2
View File
@@ -173,7 +173,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId ->
val argsArray = ArgumentUtils.convertArgumentsToStringList(environment.compilerArgs).toTypedArray()
daemon.compile(sessionId, argsArray, compilationOptions, servicesFacade, compilationResultsSink = null)
daemon.compile(sessionId, argsArray, compilationOptions, servicesFacade, compilationResults = null)
}
val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) }
@@ -205,7 +205,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId ->
val argsArray = ArgumentUtils.convertArgumentsToStringList(environment.compilerArgs).toTypedArray()
daemon.compile(sessionId, argsArray, compilationOptions, servicesFacade, GradleCompilationResultsSink(project))
daemon.compile(sessionId, argsArray, compilationOptions, servicesFacade, GradleCompilationResults(project))
}
val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) }