Add new ways to set Kotlin daemon JVM arguments.
Additionally to inheriting Gradle daemon arguments or configuring via Gradle daemon arguments system property, it is also possible now to configure arguments either using "kotlin.daemon.jvmargs" property or extension DSL. Extension DSL overrides special gradle property arguments, which overrides Gradle daemon arguments. ^KT-45747 Fixed
This commit is contained in:
+20
-2
@@ -47,14 +47,32 @@ object KotlinCompilerRunnerUtils {
|
||||
isDebugEnabled: Boolean,
|
||||
daemonOptions: DaemonOptions = configureDaemonOptions(),
|
||||
additionalJvmParams: Array<String> = arrayOf()
|
||||
): CompileServiceSession? {
|
||||
val daemonJVMOptions = configureDaemonJVMOptions(
|
||||
): CompileServiceSession? = newDaemonConnection(
|
||||
compilerId,
|
||||
clientAliveFlagFile,
|
||||
sessionAliveFlagFile,
|
||||
messageCollector,
|
||||
isDebugEnabled,
|
||||
daemonOptions,
|
||||
configureDaemonJVMOptions(
|
||||
*additionalJvmParams,
|
||||
inheritMemoryLimits = true,
|
||||
inheritOtherJvmOptions = false,
|
||||
inheritAdditionalProperties = true
|
||||
)
|
||||
)
|
||||
|
||||
@Synchronized
|
||||
@JvmStatic
|
||||
fun newDaemonConnection(
|
||||
compilerId: CompilerId,
|
||||
clientAliveFlagFile: File,
|
||||
sessionAliveFlagFile: File,
|
||||
messageCollector: MessageCollector,
|
||||
isDebugEnabled: Boolean,
|
||||
daemonOptions: DaemonOptions = configureDaemonOptions(),
|
||||
daemonJVMOptions: DaemonJVMOptions
|
||||
): CompileServiceSession? {
|
||||
val daemonReportMessages = ArrayList<DaemonReportMessage>()
|
||||
val daemonReportingTargets = DaemonReportingTargets(messages = daemonReportMessages)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user