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

Move CompilerMode and TargetPlatform to CompilationOptions

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-01-10 19:49:26 +03:00
parent c5a5463f50
commit e44cc43ada
5 changed files with 28 additions and 30 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/GradleKotlinCompilerRunner.kt
+13 -16
View File
@@ -162,15 +162,14 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
K2METADATA_COMPILER -> CompileService.TargetPlatform.METADATA
else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName")
}
val compilationOptions = CompilationOptions(
reportingFilters = getNonIncrementalReportingFilters(environment.compilerArgs.verbose),
compilerMode = CompileService.CompilerMode.NON_INCREMENTAL_COMPILER,
targetPlatform = targetPlatform)
val servicesFacade = GradleCompilerServicesFacadeImpl(project, environment.messageCollector)
val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId ->
daemon.compile(
sessionId,
CompileService.CompilerMode.NON_INCREMENTAL_COMPILER,
targetPlatform,
environment.compilerArgs,
CompilationOptions(reportingFilters = getNonIncrementalReportingFilters(environment.compilerArgs.verbose)),
GradleCompilerServicesFacadeImpl(project, environment.messageCollector))
daemon.compile(sessionId, environment.compilerArgs, compilationOptions, servicesFacade)
}
val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) }
@@ -184,7 +183,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
private fun incrementalCompilationWithDaemon(environment: GradleIncrementalCompilerEnvironment): ExitCode? {
val knownChangedFiles = environment.changedFiles as? ChangedFiles.Known
val additionalCompilerArguments = IncrementalCompilationOptions(
val compilationOptions = IncrementalCompilationOptions(
areFileChangesKnown = knownChangedFiles != null,
modifiedFiles = knownChangedFiles?.modified,
deletedFiles = knownChangedFiles?.removed,
@@ -192,16 +191,14 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
customCacheVersion = GRADLE_CACHE_VERSION,
customCacheVersionFileName = GRADLE_CACHE_VERSION_FILE_NAME,
reportingFilters = getNonIncrementalReportingFilters(environment.compilerArgs.verbose) +
getIncrementalReportingFilters(environment.compilerArgs.verbose)
getIncrementalReportingFilters(environment.compilerArgs.verbose),
compilerMode = CompileService.CompilerMode.INCREMENTAL_COMPILER,
targetPlatform = CompileService.TargetPlatform.JVM
)
val servicesFacade = GradleIncrementalCompilerServicesFacadeImpl(project, environment)
val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId ->
daemon.compile(
sessionId,
CompileService.CompilerMode.INCREMENTAL_COMPILER,
CompileService.TargetPlatform.JVM,
environment.compilerArgs,
additionalCompilerArguments,
GradleIncrementalCompilerServicesFacadeImpl(project, environment))
daemon.compile(sessionId, environment.compilerArgs, compilationOptions, servicesFacade)
}
val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) }