Merge pull request #6668 from eed3si9n/wip/bump

Zinc 1.6.0-M1

build.sbt

@@ -10,7 +10,7 @@ import scala.util.Try
 // ThisBuild settings take lower precedence,
 // but can be shared across the multi projects.
 ThisBuild / version := {
-  val v = "1.5.5-SNAPSHOT"
+  val v = "1.6.0-SNAPSHOT"
   nightlyVersion.getOrElse(v)
 }
 ThisBuild / version2_13 := "2.0.0-SNAPSHOT"

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.5.1")
+  private val ioVersion = nightlyVersion.getOrElse("1.6.0-M1")
   private val lmVersion =
-    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.5.2")
-  val zincVersion = nightlyVersion.getOrElse("1.5.5")
+    sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("1.6.0-M1")
+  val zincVersion = nightlyVersion.getOrElse("1.6.0-M1")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
 

sbt-app/src/sbt-test/source-dependencies/constants/pending

@@ -1,12 +0,0 @@
-# Marked as pending, see https://github.com/sbt/sbt/issues/1543
-# Tests if source dependencies are tracked properly
-# for compile-time constants (like final vals in top-level objects)
-# see https://issues.scala-lang.org/browse/SI-7173 for details
-# why compile-time constants can be tricky to track due to early inlining
-
-$ copy-file changes/B.scala B.scala
-
-$ copy-file changes/A1.scala A.scala
-> run 1
-$ copy-file changes/A2.scala A.scala
-> run 2

sbt-app/src/sbt-test/source-dependencies/constants/test

@@ -0,0 +1,16 @@
+> ++2.12.15!
+
+$ copy-file changes/B.scala B.scala
+
+$ copy-file changes/A1.scala A.scala
+> run 1
+$ copy-file changes/A2.scala A.scala
+> run 2
+
+> clean
+> ++2.13.6!
+
+$ copy-file changes/A1.scala A.scala
+> run 1
+$ copy-file changes/A2.scala A.scala
+> run 2