From 5586488f6c0d29216dc066ecfdbea2a148a0f3cd Mon Sep 17 00:00:00 2001 From: eugene yokota Date: Sun, 3 May 2026 02:36:00 -0400 Subject: [PATCH] [2.x] fix: Adjust the forked test classpath (#9170) **Problem** We can't test WorkerMain using forked test. **Solution** Allow WorkerMain to be shadowed. --- .../src/main/scala/sbt/internal/WorkerExchange.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala b/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala index 979bf8aae..73dd9baed 100644 --- a/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala +++ b/main-actions/src/main/scala/sbt/internal/WorkerExchange.scala @@ -35,11 +35,12 @@ object WorkerExchange: extraCp: Seq[File], connectionType: WorkerConnection, ): WorkerProxy = - val fullCp = Seq( + // put extraCp first so we can shadow the WorkerMain class + val fullCp = extraCp ++ Seq( IO.classLocationPath(classOf[WorkerMain]).toFile, IO.classLocationPath(classOf[Framework]).toFile, IO.classLocationPath(classOf[Gson]).toFile, - ) ++ extraCp + ) val inputRef = Promise[OutputStream]() val socketOpt = connectionType match case WorkerConnection.Tcp =>