Skip to content

Commit 732c1cc

Browse files
authored
Merge pull request #95 from Sciss/work
change scala version specific source directories to work with 2.13.0-RC1
2 parents 4459dcb + 7e3a3de commit 732c1cc

File tree

8 files changed

+10
-3
lines changed

8 files changed

+10
-3
lines changed

build.sbt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,16 @@ shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project
2929
lazy val swing = project.in(file("."))
3030
.settings(
3131
libraryDependencies += {
32-
val v = if (scalaVersion.value == "2.13.0-M5") "3.0.6-SNAP5" else "3.0.5"
33-
"org.scalatest" %% "scalatest" % v % Test
32+
"org.scalatest" %% "scalatest" % "3.0.7" % Test
33+
},
34+
// Adds a `src/main/scala-2.13+` source directory for Scala 2.13 and newer
35+
// and a `src/main/scala-2.13-` source directory for Scala version older than 2.13
36+
unmanagedSourceDirectories in Compile += {
37+
val sourceDir = (sourceDirectory in Compile).value
38+
CrossVersion.partialVersion(scalaVersion.value) match {
39+
case Some((2, n)) if n >= 13 => sourceDir / "scala-2.13+"
40+
case _ => sourceDir / "scala-2.13-"
41+
}
3442
}
3543
)
3644

src/main/scala-2.11

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)