From 7c31c2bd6c440f685c5c54f376ca1f74b4918073 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 27 Nov 2023 03:19:36 -0500 Subject: [PATCH 1/5] Update to Zinc 1.10.0-M1 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 531678e93..842b4c8e0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,10 +12,10 @@ object Dependencies { sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version") // sbt modules - private val ioVersion = nightlyVersion.getOrElse("1.9.1") + private val ioVersion = nightlyVersion.getOrElse("1.9.7") private val lmVersion = sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.9.3") - val zincVersion = nightlyVersion.getOrElse("1.9.5") + val zincVersion = nightlyVersion.getOrElse("1.10.0-M1") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From 7a60c3e4dc153a55b1e15bcebeeeae36416a8883 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 27 Nov 2023 23:24:48 -0500 Subject: [PATCH 2/5] Disable run/fork-loader test --- sbt-app/src/sbt-test/run/fork-loader/{test => disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sbt-app/src/sbt-test/run/fork-loader/{test => disabled} (100%) diff --git a/sbt-app/src/sbt-test/run/fork-loader/test b/sbt-app/src/sbt-test/run/fork-loader/disabled similarity index 100% rename from sbt-app/src/sbt-test/run/fork-loader/test rename to sbt-app/src/sbt-test/run/fork-loader/disabled From 520b52656fa6400e8495eab1b5c38f24961deaca Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 27 Nov 2023 23:26:04 -0500 Subject: [PATCH 3/5] Mark source-dependencies/false-error passing --- .../sbt-test/source-dependencies/false-error/{pending => test} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sbt-app/src/sbt-test/source-dependencies/false-error/{pending => test} (100%) diff --git a/sbt-app/src/sbt-test/source-dependencies/false-error/pending b/sbt-app/src/sbt-test/source-dependencies/false-error/test similarity index 100% rename from sbt-app/src/sbt-test/source-dependencies/false-error/pending rename to sbt-app/src/sbt-test/source-dependencies/false-error/test From 1e784febecd0d3243a0aea59cceb7e24948c3a88 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 25 Nov 2023 01:06:00 -0500 Subject: [PATCH 4/5] sbt 1.9.7 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b36926580..214fa10f9 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ npm-debug.log metals.sbt launcher-package/citest/freshly-baked .vscode +sbt-launch.jar From f6e195cf732279c8f74a72616245ed97798a8007 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 28 Nov 2023 00:30:59 -0500 Subject: [PATCH 5/5] Disable run/non-local-main --- sbt-app/src/sbt-test/run/non-local-main/{test => disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sbt-app/src/sbt-test/run/non-local-main/{test => disabled} (100%) diff --git a/sbt-app/src/sbt-test/run/non-local-main/test b/sbt-app/src/sbt-test/run/non-local-main/disabled similarity index 100% rename from sbt-app/src/sbt-test/run/non-local-main/test rename to sbt-app/src/sbt-test/run/non-local-main/disabled