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