From fb012ff6fbdafda09b71fb31893c95c976f72e52 Mon Sep 17 00:00:00 2001 From: Gabriele Petronella Date: Fri, 20 Jan 2017 15:33:54 +0100 Subject: [PATCH] Support for Scala 2.12 --- .../scala/buildo/ScalaSettingPlugin.scala | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/main/scala/buildo/ScalaSettingPlugin.scala b/src/main/scala/buildo/ScalaSettingPlugin.scala index f3922b9..ca869e0 100644 --- a/src/main/scala/buildo/ScalaSettingPlugin.scala +++ b/src/main/scala/buildo/ScalaSettingPlugin.scala @@ -11,23 +11,30 @@ object ScalaSettingPlugin extends AutoPlugin { override def projectSettings: Seq[Def.Setting[_]] = baseSettings lazy val baseBuildSettings: Seq[Def.Setting[_]] = Seq( - organization := "io.buildo", - scalaVersion := "2.11.8" + organization := "io.buildo" ) + def crossFlags(scalaVersion: String): Seq[String] = + CrossVersion.partialVersion(scalaVersion) match { + case Some((2, 11)) => Seq("-Yinline-warnings") + case Some((2, 12)) => Seq("-opt-warnings") + case _ => Nil + } + lazy val baseSettings: Seq[Def.Setting[_]] = Seq( cancelable in Global := true, - scalacOptions ++= Seq("-encoding", "utf8"), - scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-Xlint"), - scalacOptions += "-language:higherKinds", - scalacOptions += "-language:implicitConversions", - scalacOptions += "-Xfuture", - scalacOptions += "-Yinline-warnings", - scalacOptions += "-Ywarn-dead-code", - scalacOptions += "-Ywarn-numeric-widen", - scalacOptions += "-Ywarn-value-discard", - scalacOptions += "-Ywarn-unused", - scalacOptions += "-Ywarn-unused-import" + scalacOptions ++= Seq( + "-encoding", "utf8", + "-deprecation", "-feature", "-unchecked", "-Xlint", + "-language:higherKinds", + "-language:implicitConversions", + "-Xfuture", + "-Ywarn-dead-code", + "-Ywarn-numeric-widen", + "-Ywarn-value-discard", + "-Ywarn-unused", + "-Ywarn-unused-import" + ) ++ crossFlags(scalaVersion.value) ) }