cleanups
diff --git a/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/v2/ExecutionModeSettings.kt b/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/v2/ExecutionModeSettings.kt
index ca62736..522efded 100644
--- a/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/v2/ExecutionModeSettings.kt
+++ b/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/v2/ExecutionModeSettings.kt
@@ -5,28 +5,4 @@
package org.jetbrains.kotlin.buildtools.api.v2
-public interface ExecutionPolicy
-//
-//public interface ExecutionPolicy {
-// public interface Option<V>
-//
-// public operator fun <V> get(key: Option<V>): V
-//
-// public operator fun <V> set(key: Option<V>, value: V)
-//
-// public enum class ExecutionMode {
-// IN_PROCESS,
-// DAEMON,
-// }
-//
-// public companion object {
-// private fun <V> optional(id: String, defaultValue: V): Option<V> =
-// object : WithDefault<V>(id, defaultValue), Option<V> {}
-//
-// @JvmField
-// public val EXECUTION_MODE: Option<ExecutionMode> = optional("EXECUTION_MODE", ExecutionMode.IN_PROCESS)
-//
-// @JvmField
-// public val DAEMON_JVM_ARGUMENTS: Option<List<String>> = optional("DAEMON_JVM_ARGUMENTS", emptyList())
-// }
-//}
\ No newline at end of file
+public interface ExecutionPolicy
\ No newline at end of file
diff --git a/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/BuildOperationImpl.kt b/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/BuildOperationImpl.kt
index d3bd246..b32d07b 100644
--- a/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/BuildOperationImpl.kt
+++ b/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/BuildOperationImpl.kt
@@ -11,7 +11,6 @@
import org.jetbrains.kotlin.buildtools.api.v2.BuildOperation.Companion.PROJECT_ID
import org.jetbrains.kotlin.buildtools.api.v2.BuildOperation.Option
import org.jetbrains.kotlin.buildtools.api.v2.ExecutionPolicy
-import org.jetbrains.kotlin.buildtools.internal.v2.OptionsDelegate
abstract class BuildOperationImpl<R> : BuildOperation<R> {
protected val optionsDelegate = OptionsDelegate()
diff --git a/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/OptionsDelegate.kt b/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/OptionsDelegate.kt
index 2196d47..c65d059 100644
--- a/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/OptionsDelegate.kt
+++ b/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/OptionsDelegate.kt
@@ -18,8 +18,6 @@
operator fun <V> get(key: BaseOption<V>): V {
return if (key !in optionsMap) {
error("$key not present in options")
- } else {
- optionsMap[key] as V
- }
+ } else optionsMap[key] as V
}
}
\ No newline at end of file
diff --git a/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/jvm/operations/JvmCompilationOperationImpl.kt b/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/jvm/operations/JvmCompilationOperationImpl.kt
index db7e6bf..1d12633 100644
--- a/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/jvm/operations/JvmCompilationOperationImpl.kt
+++ b/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/v2/jvm/operations/JvmCompilationOperationImpl.kt
@@ -106,8 +106,8 @@
}
}
- private fun JvmCompilerArgumentsImpl.toDaemonCompilationOptions(logger: KotlinLogger): CompilationOptions {
- val ktsExtensionsAsArray = get(JvmCompilationOperation.Companion.KOTLINSCRIPT_EXTENSIONS)
+ private fun toDaemonCompilationOptions(logger: KotlinLogger): CompilationOptions {
+ val ktsExtensionsAsArray = get(KOTLINSCRIPT_EXTENSIONS)
val reportCategories = arrayOf(
ReportCategory.COMPILER_MESSAGE.code, ReportCategory.IC_MESSAGE.code
) // TODO: automagically compute the value, related to BasicCompilerServicesWithResultsFacadeServer
@@ -183,7 +183,7 @@
val (daemon, sessionId) = KotlinCompilerRunnerUtils.newDaemonConnection(
compilerId, clientIsAliveFile, sessionIsAliveFlagFile, loggerAdapter, false, daemonJVMOptions = jvmOptions
) ?: return ExitCode.INTERNAL_ERROR.asCompilationResult
- val daemonCompileOptions = compilerArguments.toDaemonCompilationOptions(loggerAdapter.kotlinLogger)
+ val daemonCompileOptions = toDaemonCompilationOptions(loggerAdapter.kotlinLogger)
val isIncrementalCompilation = daemonCompileOptions is IncrementalCompilationOptions
if (isIncrementalCompilation && daemonCompileOptions.useJvmFirRunner) {
checkJvmFirRequirements(compilerArguments)
@@ -198,7 +198,7 @@
kotlinSources
} else {
val kotlinFilenameExtensions =
- DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS + (get(JvmCompilationOperation.Companion.KOTLINSCRIPT_EXTENSIONS) ?: emptyArray())
+ DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS + (get(KOTLINSCRIPT_EXTENSIONS) ?: emptyArray())
kotlinSources.filter { it.toFile().isKotlinFile(kotlinFilenameExtensions) }
}
val arguments = compilerArguments.toCompilerArguments()
