From ddd165c54f366fc7a60379e31c6e7994399c84f3 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 11 Apr 2023 18:53:05 +0200 Subject: [PATCH] Don't require --fork when --hybrid is passed to the launch command (#2738) --- .../src/main/scala/coursier/clitests/LaunchTests.scala | 1 - modules/cli/src/main/scala/coursier/cli/launch/Launch.scala | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/cli-tests/src/main/scala/coursier/clitests/LaunchTests.scala b/modules/cli-tests/src/main/scala/coursier/clitests/LaunchTests.scala index f08be5c12b..0803317e3c 100644 --- a/modules/cli-tests/src/main/scala/coursier/clitests/LaunchTests.scala +++ b/modules/cli-tests/src/main/scala/coursier/clitests/LaunchTests.scala @@ -238,7 +238,6 @@ abstract class LaunchTests extends TestSuite with LauncherOptions { "--hybrid", "--work-dir", workDir, - "--fork", extraCsArgs, "--", "--help" diff --git a/modules/cli/src/main/scala/coursier/cli/launch/Launch.scala b/modules/cli/src/main/scala/coursier/cli/launch/Launch.scala index 918b9ebf29..ee57de3b24 100644 --- a/modules/cli/src/main/scala/coursier/cli/launch/Launch.scala +++ b/modules/cli/src/main/scala/coursier/cli/launch/Launch.scala @@ -407,7 +407,7 @@ object Launch extends CoursierCommand[LaunchOptions] { b.result() } - if (params.fork) + if (params.fork || params.hybrid) launchFork( hierarchy0, mainClass0,