Compilation fixes

jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt

@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.daemon.client.reportFromDaemon
 import org.jetbrains.kotlin.daemon.common.JpsCompilerServicesFacade
 import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
 import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
+import org.jetbrains.kotlin.incremental.components.InlineConstTracker
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.js.IncrementalDataProvider
 import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumer
@@ -36,6 +37,7 @@ internal class JpsCompilerServicesFacadeImpl(
     env.services[LookupTracker::class.java],
     env.services[CompilationCanceledStatus::class.java],
     env.services[ExpectActualTracker::class.java],
+    env.services[InlineConstTracker::class.java],
     env.services[IncrementalResultsConsumer::class.java],
     env.services[IncrementalDataProvider::class.java],
     port

jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt

@@ -354,6 +354,7 @@ class JpsKotlinCompilerRunner {
             val daemonOptions = configureDaemonOptions()
             val additionalJvmParams = mutableListOf<String>()
 
+            @Suppress("DEPRECATION")
             IncrementalCompilation.toJvmArgs(additionalJvmParams)
 
             val clientFlagFile = KotlinCompilerClient.getOrCreateClientFlagFile(daemonOptions)

jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt

@@ -203,7 +203,8 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
                 isTests,
                 // this excludes the output directories from the class path, to be removed for true incremental compilation
                 outputDirs,
-                friendDirs
+                friendDirs,
+                IncrementalCompilation.isEnabledForJvm()
             )
         }