From 622eabfa953b6e878e7a4479e1a0c69104b5bd17 Mon Sep 17 00:00:00 2001 From: Brice Jaglin Date: Sat, 15 May 2021 22:07:33 +0200 Subject: [PATCH] dedup unmanagedSourceDirectories for Scala 3 For Scala 3, scalaBinaryVersion == epochVersion --- main/src/main/scala/sbt/Defaults.scala | 2 +- .../sbt-test/project/scala3-binary-version/build.sbt | 11 +++++++++++ .../src/sbt-test/project/scala3-binary-version/test | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 sbt-app/src/sbt-test/project/scala3-binary-version/build.sbt create mode 100644 sbt-app/src/sbt-test/project/scala3-binary-version/test diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 933b046b4..896c51c07 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -745,7 +745,7 @@ object Defaults extends BuildCommon { scalaSrcDir.getParentFile / s"${scalaSrcDir.name}-$sv", scalaSrcDir.getParentFile / s"${scalaSrcDir.name}-$epochVersion", javaSrcDir, - ) + ).distinct else Seq(scalaSrcDir, javaSrcDir) } diff --git a/sbt-app/src/sbt-test/project/scala3-binary-version/build.sbt b/sbt-app/src/sbt-test/project/scala3-binary-version/build.sbt new file mode 100644 index 000000000..521755296 --- /dev/null +++ b/sbt-app/src/sbt-test/project/scala3-binary-version/build.sbt @@ -0,0 +1,11 @@ +ThisBuild / scalaVersion := "3.0.0" + +lazy val check = taskKey[Unit]("check") + +lazy val root = project.in(file(".")) + .settings( + check := { + val dirs = (Compile / unmanagedSourceDirectories).value + assert(dirs == dirs.distinct) + } + ) diff --git a/sbt-app/src/sbt-test/project/scala3-binary-version/test b/sbt-app/src/sbt-test/project/scala3-binary-version/test new file mode 100644 index 000000000..15675b169 --- /dev/null +++ b/sbt-app/src/sbt-test/project/scala3-binary-version/test @@ -0,0 +1 @@ +> check