From 3c66c234cbdd5816cc101082d27bfa8cb3781d35 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 27 Nov 2018 17:50:25 +0100 Subject: [PATCH] Tweak dotty-specific source directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the dotty community build, the version is forced to something other than 0.10 (e.g. 0.12.…), so scala-2.10 isn't taken into account without this change. --- build.sbt | 6 +++--- .../src/main/{scala-0.10 => dotty}/sourcecode/Macros.scala | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename sourcecode/shared/src/main/{scala-0.10 => dotty}/sourcecode/Macros.scala (100%) diff --git a/build.sbt b/build.sbt index b1e969a..e437a2d 100644 --- a/build.sbt +++ b/build.sbt @@ -55,14 +55,14 @@ lazy val sourcecode = crossProject(JSPlatform, JVMPlatform, NativePlatform) Seq() } - val scala2 = crossVer match { + val scala2OrDotty = crossVer match { case Some((2, _)) => Seq(baseDirectory.value / ".." / "shared" / "src" / "main" / "scala-2.x") case _ => - Seq() + Seq(baseDirectory.value / ".." / "shared" / "src" / "main" / "dotty") } - scala211plus ++ scala2 + scala211plus ++ scala2OrDotty }, // Osgi settings osgiSettings, diff --git a/sourcecode/shared/src/main/scala-0.10/sourcecode/Macros.scala b/sourcecode/shared/src/main/dotty/sourcecode/Macros.scala similarity index 100% rename from sourcecode/shared/src/main/scala-0.10/sourcecode/Macros.scala rename to sourcecode/shared/src/main/dotty/sourcecode/Macros.scala