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 
Original commit: e44cc43ada
This commit is contained in:
Alexey Tsvetkov
2017-01-10 19:49:26 +03:00
parent bbfaf35bff
commit 8571c2086e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
+4 -7
View File
@@ -99,13 +99,10 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
} }
val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId -> val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId ->
daemon.compile( val options = CompilationOptions(CompileService.CompilerMode.JPS_COMPILER,
sessionId, targetPlatform,
CompileService.CompilerMode.JPS_COMPILER, reportingFilters = getReportingFilters(compilerArgs.verbose))
targetPlatform, daemon.compile(sessionId, compilerArgs, options, JpsCompilerServicesFacadeImpl(environment))
compilerArgs,
CompilationOptions(reportingFilters = getReportingFilters(compilerArgs.verbose)),
JpsCompilerServicesFacadeImpl(environment))
} }
return res?.get()?.let { exitCodeFromProcessExitCode(it) } return res?.get()?.let { exitCodeFromProcessExitCode(it) }