Skip to content

Commit

Permalink
JaunchConfig: don't de-duplicate main/runtime args
Browse files Browse the repository at this point in the history
These fields could have important flags that appear multiple times.
  • Loading branch information
hinerm committed Dec 17, 2024
1 parent 331c180 commit ef6984d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/commonMain/kotlin/config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ data class JaunchConfig (
pythonVersionMin = config.pythonVersionMin ?: pythonVersionMin,
pythonVersionMax = config.pythonVersionMax ?: pythonVersionMax,
pythonPackages = merge(config.pythonPackages, pythonPackages),
pythonRuntimeArgs = merge(config.pythonRuntimeArgs, pythonRuntimeArgs),
pythonRuntimeArgs = config.pythonRuntimeArgs + pythonRuntimeArgs,
pythonScriptPath = merge(config.pythonScriptPath, pythonScriptPath),
pythonMainArgs = merge(config.pythonMainArgs, pythonMainArgs),
pythonMainArgs = config.pythonMainArgs + pythonMainArgs,

jvmEnabled = config.jvmEnabled ?: jvmEnabled,
jvmRecognizedArgs = merge(config.jvmRecognizedArgs, jvmRecognizedArgs),
Expand All @@ -182,9 +182,9 @@ data class JaunchConfig (
jvmLibSuffixes = merge(config.jvmLibSuffixes, jvmLibSuffixes),
jvmClasspath = merge(config.jvmClasspath, jvmClasspath),
jvmMaxHeap = config.jvmMaxHeap ?: jvmMaxHeap,
jvmRuntimeArgs = merge(config.jvmRuntimeArgs, jvmRuntimeArgs),
jvmRuntimeArgs = config.jvmRuntimeArgs + jvmRuntimeArgs,
jvmMainClass = merge(config.jvmMainClass, jvmMainClass),
jvmMainArgs = merge(config.jvmMainArgs, jvmMainArgs),
jvmMainArgs = config.jvmMainArgs + jvmMainArgs,
)
}

Expand Down

0 comments on commit ef6984d

Please sign in to comment.