From e91b651a03af32f1e0a6483121c8a4473d24b4bf Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 29 Jan 2019 18:15:40 -0500 Subject: [PATCH 1/2] Zinc 1.3.0-M2, Util 1.3.0-M4 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f09e6cfc7..cc9d1e0dd 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,13 +10,13 @@ object Dependencies { // sbt modules private val ioVersion = "1.3.0-M5" - private val utilVersion = "1.3.0-M3" + private val utilVersion = "1.3.0-M4" private val lmVersion = sys.props.get("sbt.build.lm.version") match { case Some(version) => version case _ => "1.3.0-M1" } - private val zincVersion = "1.2.5" + private val zincVersion = "1.3.0-M2" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From 67a0962b183628c962084e24e5fe8cc789bda9cf Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 30 Jan 2019 01:43:28 -0500 Subject: [PATCH 2/2] Diable these tests Ref #4514 There's a problem with calling scripted from scripted tests. It's likely the bug is in the metabuild of sbt/sbt, not sbt itself. --- sbt/src/sbt-test/project/scripted-plugin/{test => disabled} | 0 .../project/scripted-skip-incompatible/{test => disabled} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename sbt/src/sbt-test/project/scripted-plugin/{test => disabled} (100%) rename sbt/src/sbt-test/project/scripted-skip-incompatible/{test => disabled} (100%) diff --git a/sbt/src/sbt-test/project/scripted-plugin/test b/sbt/src/sbt-test/project/scripted-plugin/disabled similarity index 100% rename from sbt/src/sbt-test/project/scripted-plugin/test rename to sbt/src/sbt-test/project/scripted-plugin/disabled diff --git a/sbt/src/sbt-test/project/scripted-skip-incompatible/test b/sbt/src/sbt-test/project/scripted-skip-incompatible/disabled similarity index 100% rename from sbt/src/sbt-test/project/scripted-skip-incompatible/test rename to sbt/src/sbt-test/project/scripted-skip-incompatible/disabled