Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ object BloopStart extends ScalaCommand[BloopStartOptions] {
)
def run(options: BloopStartOptions, args: RemainingArgs): Unit = {
val threads = BloopThreads.create()
val bloopRifleConfig = options.bloopRifleConfig
val bloopRifleConfig = options.bloopRifleConfig()
val logger = options.logging.logger

val isRunning =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ final case class SharedCompilationServerOptions(
@Group("Compilation server")
@HelpMessage("Maximum duration to wait for compilation server to start up")
@ValueDescription("duration")
bloopStartupTimeout: Option[String] = None
bloopStartupTimeout: Option[String] = None,

@Group("Compilation server")
bloopDefaultJavaOpts: Boolean = true,
@Group("Compilation server")
bloopJavaOpt: List[String] = Nil
) {
// format: on

Expand Down Expand Up @@ -178,7 +183,8 @@ final case class SharedCompilationServerOptions(
bspStderr = if (verbosity >= 3) Some(System.err) else None,
period = bloopBspCheckPeriodDuration.getOrElse(baseConfig.period),
timeout = bloopBspTimeoutDuration.getOrElse(baseConfig.timeout),
initTimeout = bloopStartupTimeoutDuration.getOrElse(baseConfig.initTimeout)
initTimeout = bloopStartupTimeoutDuration.getOrElse(baseConfig.initTimeout),
javaOpts = (if (bloopDefaultJavaOpts) baseConfig.javaOpts else Nil) ++ bloopJavaOpt
)
}

Expand Down
4 changes: 4 additions & 0 deletions website/docs/reference/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ Duration between checks of the BSP connection state

Maximum duration to wait for compilation server to start up

#### `--bloop-default-java-opts`

#### `--bloop-java-opt`

## Compile options

Available in commands:
Expand Down