aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2017-07-30 17:30:16 -0700
committerJakob Odersky <jakob@driver.xyz>2017-07-31 17:52:20 -0700
commit9805356a0cb971bc7fa86911b15a6c53eb55903b (patch)
tree907414a9353f2e3f4b1305fdd63e595f4e165758 /src
parent4ebcc8354ca35e1a3c88e95413ffc5f48402a221 (diff)
downloadsbt-settings-9805356a0cb971bc7fa86911b15a6c53eb55903b.tar.gz
sbt-settings-9805356a0cb971bc7fa86911b15a6c53eb55903b.tar.bz2
sbt-settings-9805356a0cb971bc7fa86911b15a6c53eb55903b.zip
Prepare to support scala 2.12
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/xyz.driver.sbt/SbtSettings.scala8
1 files changed, 4 insertions, 4 deletions
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