diff options
| author | Jon Pretty <jon.pretty@propensive.com> | 2018-06-05 16:27:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 16:27:54 +0200 |
| commit | 408d6da3eb8cccca5c2afac727fd4aa01eb57bbc (patch) | |
| tree | 6c3fb7f78981d39152c42f6fefce5f3426364209 | |
| parent | 3d3d0d657fb805f8f7d48a1299660db3fc703db9 (diff) | |
| parent | 2b6165ccd2643d1ef9859aa411c336f7c58224c2 (diff) | |
| download | magnolia-408d6da3eb8cccca5c2afac727fd4aa01eb57bbc.tar.gz magnolia-408d6da3eb8cccca5c2afac727fd4aa01eb57bbc.tar.bz2 magnolia-408d6da3eb8cccca5c2afac727fd4aa01eb57bbc.zip | |
Merge pull request #92 from SethTisue/community-build-2.12
handle more diverse Scala version numbers
| -rw-r--r-- | build.sbt | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -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, |