Skip to content

Commit 3e76b15

Browse files
committed
be Scala 2.13 friendly
although the 2.13 effort is only just getting underway, we do already have a Scala 2.13 community build, and this fixes the build to work in that context also bump sbt version to latest, for good measure
1 parent 50c3ccb commit 3e76b15

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

build.sbt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@ lazy val sourcecode = crossProject.settings(
1919
organization := "com.lihaoyi",
2020
libraryDependencies ++= macroDependencies(scalaVersion.value),
2121
unmanagedSourceDirectories in Compile ++= {
22-
if (scalaVersion.value startsWith "2.12.") Seq(baseDirectory.value / ".."/"shared"/"src"/ "main" / "scala-2.11")
23-
else Seq()
22+
CrossVersion.partialVersion(scalaVersion.value) match {
23+
case Some((2, n)) if n >= 12 =>
24+
Seq(baseDirectory.value / ".."/"shared"/"src"/ "main" / "scala-2.11")
25+
case _ =>
26+
Seq()
27+
}
2428
},
2529
publishTo := Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"),
2630

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.12
1+
sbt.version=0.13.13

0 commit comments

Comments
 (0)