From c0f788a460778f40e12744fb131f0bf3f112f76e Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 9 Sep 2026 18:57:34 -0400 Subject: [PATCH 1/2] [2.x] Update Zinc to 2.1.0-M2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 75e6bf692..d21d252cd 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,7 @@ object Dependencies { // sbt modules val ioVersion = nightlyVersion.getOrElse("1.13.2") - val zincVersion = nightlyVersion.getOrElse("2.0.4") + val zincVersion = nightlyVersion.getOrElse("2.1.0-M2") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From 746fdcc077c5c69fa90fc71b07b8d63f34deb410 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 10 Sep 2026 11:49:51 -0400 Subject: [PATCH 2/2] test: Make the test more robust --- .../fork-worker-split/src/test/scala/example/Marker.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sbt-app/src/sbt-test/tests/fork-worker-split/src/test/scala/example/Marker.scala b/sbt-app/src/sbt-test/tests/fork-worker-split/src/test/scala/example/Marker.scala index 58a288cd3..cea1b2946 100644 --- a/sbt-app/src/sbt-test/tests/fork-worker-split/src/test/scala/example/Marker.scala +++ b/sbt-app/src/sbt-test/tests/fork-worker-split/src/test/scala/example/Marker.scala @@ -3,6 +3,7 @@ package example import java.io.{ File, PrintWriter } import java.lang.management.ManagementFactory import java.nio.file.Files +import scala.util.control.NonFatal import munit.FunSuite trait Marker extends FunSuite: @@ -22,7 +23,11 @@ trait Marker extends FunSuite: Thread.sleep(1000) val peers = new File(".").listFiles().toVector .filter(_.getName.startsWith("running-")) - .map(f => new String(Files.readAllBytes(f.toPath))) + .flatMap:f => + try + Some(new String(Files.readAllBytes(f.toPath))) + catch + case NonFatal(_) => None .toSet val pw = new PrintWriter(new File(s"peers-$n")) try pw.print(peers.size)