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 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 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 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 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