Move CompilerMode and TargetPlatform to CompilationOptions

Original commit: e44cc43ada
2017-01-10 19:49:26 +03:00
parent bbfaf35bff
commit 8571c2086e
1 changed files with 4 additions and 7 deletions
@@ -99,13 +99,10 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
        }

        val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId ->
-            daemon.compile(
-                    sessionId,
-                    CompileService.CompilerMode.JPS_COMPILER,
-                    targetPlatform,
-                    compilerArgs,
-                    CompilationOptions(reportingFilters = getReportingFilters(compilerArgs.verbose)),
-                    JpsCompilerServicesFacadeImpl(environment))
+            val options = CompilationOptions(CompileService.CompilerMode.JPS_COMPILER,
+                                             targetPlatform,
+                                             reportingFilters = getReportingFilters(compilerArgs.verbose))
+            daemon.compile(sessionId, compilerArgs, options, JpsCompilerServicesFacadeImpl(environment))
        }

        return res?.get()?.let { exitCodeFromProcessExitCode(it) }