From 2b6165ccd2643d1ef9859aa411c336f7c58224c2 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 17 Apr 2018 21:16:08 +0100 Subject: handle more diverse Scala version numbers for the Scala community build, for use with Scala nightly builds, and so on --- build.sbt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 8a2a8c3..0239960 100644 --- a/build.sbt +++ b/build.sbt @@ -127,13 +127,12 @@ lazy val publishSettings = Seq( ) ) -lazy val unmanagedSettings = unmanagedBase := (scalaVersion.value - .split("\\.") - .map(_.toInt) - .to[List] match { - case List(2, 12, _) => baseDirectory.value / "lib" / "2.12" - case List(2, 11, _) => baseDirectory.value / "lib" / "2.11" -}) +lazy val unmanagedSettings = unmanagedBase := + baseDirectory.value / "lib" / + (CrossVersion.partialVersion(scalaVersion.value) match { + case Some((2, 11)) => "2.11" + case _ => "2.12" + }) lazy val scalaMacroDependencies: Seq[Setting[_]] = Seq( libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value, -- cgit v1.2.3