From 496e8d3e4fb03e2fd828e6bec75cf01e2c5f348f Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 22 Dec 2016 22:30:45 -0500 Subject: [PATCH] Cross building --- build.sbt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 58897af1e..bc11d37f1 100644 --- a/build.sbt +++ b/build.sbt @@ -15,9 +15,13 @@ def commonSettings: Seq[Setting[_]] = Seq( testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-w", "1"), javacOptions in compile ++= Seq("-Xlint", "-Xlint:-serial"), crossScalaVersions := Seq(scala211, scala212), - scalacOptions ++= Seq("-Ywarn-unused", "-Ywarn-unused-import"), - scalacOptions --= // scalac 2.10 rejects some HK types under -Xfuture it seems.. - (CrossVersion partialVersion scalaVersion.value collect { case (2, 10) => List("-Xfuture", "-Ywarn-unused", "-Ywarn-unused-import") }).toList.flatten, + scalacOptions := { + val old = scalacOptions.value + scalaVersion.value match { + case sv if sv.startsWith("2.10") => old diff List("-Xfuture", "-Ywarn-unused", "-Ywarn-unused-import") + case _ => old ++ List("-Ywarn-unused", "-Ywarn-unused-import") + } + }, scalacOptions in console in Compile -= "-Ywarn-unused-import", scalacOptions in console in Test -= "-Ywarn-unused-import", mimaPreviousArtifacts := Set(), // Some(organization.value %% moduleName.value % "1.0.0"), @@ -97,7 +101,7 @@ lazy val utilLogging = (project in internalPath / "util-logging"). dependsOn(utilInterface, utilTesting % Test). settings( commonSettings, - crossScalaVersions := Seq(scala210, scala211), + crossScalaVersions := Seq(scala210, scala211, scala212), name := "Util Logging", libraryDependencies += jline ) @@ -143,7 +147,7 @@ lazy val utilTracking = (project in internalPath / "util-tracking"). lazy val utilTesting = (project in internalPath / "util-testing"). settings( commonSettings, - crossScalaVersions := Seq(scala210, scala211), + crossScalaVersions := Seq(scala210, scala211, scala212), name := "Util Testing", libraryDependencies ++= Seq(scalaCheck, scalatest) )