From 9805356a0cb971bc7fa86911b15a6c53eb55903b Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Sun, 30 Jul 2017 17:30:16 -0700 Subject: Prepare to support scala 2.12 --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index d8df347..e81e85f 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -187,8 +187,7 @@ object SbtSettings extends AutoPlugin { } lazy val acyclicSettings = - Seq(autoCompilerPlugins := true, addCompilerPlugin("com.lihaoyi" %% "acyclic" % "0.1.4")) - + Seq(autoCompilerPlugins := true, addCompilerPlugin("com.lihaoyi" %% "acyclic" % "0.1.7")) implicit class driverConfigurations(project: Project) { def gitPluginConfiguration: Project = { @@ -381,14 +380,15 @@ object SbtSettings extends AutoPlugin { override def trigger: PluginTrigger = allRequirements override def projectSettings: Seq[Setting[_]] = Defaults.coreDefaultSettings ++ Seq( organization := "xyz.driver", - scalaVersion := "2.11.11", + crossScalaVersions := List("2.11.11", "2.12.3"), + scalaVersion := crossScalaVersions.value.head, scalacOptions := (scalacDefaultOptions ++ scalacLanguageFeatures ++ scalacLintingOptions), scalacOptions in (Compile, console) := (scalacDefaultOptions ++ scalacLanguageFeatures), scalacOptions in (Compile, consoleQuick) := (scalacDefaultOptions ++ scalacLanguageFeatures), scalacOptions in (Compile, consoleProject) := (scalacDefaultOptions ++ scalacLanguageFeatures), libraryDependencies ++= Seq( "org.scalaz" %% "scalaz-core" % "7.2.8", - "com.lihaoyi" %% "acyclic" % "0.1.4" % "provided" + "com.lihaoyi" %% "acyclic" % "0.1.7" % "provided" ), version <<= version(v => { // Sbt release versioning based on git given double -SNAPSHOT suffix -- cgit v1.2.3