From 6b529200e606fe9c68166950bfc2b0809f1457ac Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Tue, 28 Jul 2015 09:33:37 -0700 Subject: [PATCH 1/3] Build for Scala 2.11.7, update Scala 2.10 build to 2.10.4, update SBT to 0.13.7 --- build.sbt | 14 +++++++++++--- project/build.properties | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 5309352..2f845f4 100644 --- a/build.sbt +++ b/build.sbt @@ -10,15 +10,23 @@ licenses := Seq("Apache License, Version 2.0" -> url("http://www.apache.org/lice scalaVersion := "2.9.2" -crossScalaVersions := Seq("2.9.1", "2.9.2", "2.10.0") +crossScalaVersions := Seq("2.9.1", "2.9.2", "2.10.4", "2.11.7") libraryDependencies ++= Seq( "org.slf4j" % "slf4j-api" % "1.7.2", "ch.qos.logback" % "logback-classic" % "1.0.0" % "test", - "junit" % "junit" % "4.11" % "test", - "org.specs2" %% "specs2" % "1.12.3" % "test" + "junit" % "junit" % "4.11" % "test" ) +libraryDependencies <++= scalaVersion { + case x if x.startsWith("2.9.") => Seq( + "org.specs2" %% "specs2" % "1.12.3" % "test" + ) + case _ => Seq( + "org.specs2" %% "specs2-core" % "3.6.3" % "test" + ) +} + scalacOptions ++= Seq("-optimize", "-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8") cancelable := true diff --git a/project/build.properties b/project/build.properties index 4474a03..748703f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.1 +sbt.version=0.13.7 From e1cfbc71bf8bad375313d75c548242a980393936 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Tue, 28 Jul 2015 17:40:24 -0700 Subject: [PATCH 2/3] Add specs2-junit. --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 2f845f4..d2d5d5d 100644 --- a/build.sbt +++ b/build.sbt @@ -23,7 +23,8 @@ libraryDependencies <++= scalaVersion { "org.specs2" %% "specs2" % "1.12.3" % "test" ) case _ => Seq( - "org.specs2" %% "specs2-core" % "3.6.3" % "test" + "org.specs2" %% "specs2-core" % "3.6.3" % "test", + "org.specs2" %% "specs2-junit" % "3.6.3" % "test" ) } From 3791117e91cd1487725b780d41cd586ad71892fb Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Tue, 28 Jul 2015 17:57:50 -0700 Subject: [PATCH 3/3] Bump ls-sbt to 0.1.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e39f18c..1c0b940 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.2") +addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3")