Merge branch 'release/0.1.3'

ethul · Aug 11, 2014 · 7d7879e · 7d7879e
2 parents 2394aff + 21bfbc4
commit 7d7879e
Showing 1 changed file with 34 additions and 23 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ organization := "com.github.ethul"
 
 name := "redis-algebra"
 
-version := "0.1.2"
+version := "0.1.3"
 
 scalaVersion := "2.11.2"
 
@@ -14,28 +14,39 @@ libraryDependencies += "org.specs2" %% "specs2" % "2.4" % "test"
 
 resolvers += "Sonatype releases" at "https://oss.sonatype.org/content/repositories/releases/"
 
-scalacOptions ++= Seq(
-  "-deprecation",
-  "-encoding", "UTF-8",
-  "-feature",
-  "-language:higherKinds",
-  "-language:implicitConversions",
-  "-language:postfixOps",
-  "-unchecked",
-  "-Xfatal-warnings",
-  "-Xlint:_",
-  "-Yno-adapted-args",
-  "-Ywarn-adapted-args",
-  "-Ywarn-dead-code",
-  "-Ywarn-inaccessible",
-  "-Ywarn-infer-any",
-  "-Ywarn-nullary-override",
-  "-Ywarn-nullary-unit",
-  "-Ywarn-numeric-widen",
-  "-Ywarn-unused",
-  "-Ywarn-unused-import",
-  "-Ywarn-value-discard"
-)
+scalacOptions <<= scalaVersion map { a =>
+  if (a.startsWith("2.10.")) {
+    Seq("-deprecation",
+        "-feature",
+        "-language:higherKinds",
+        "-unchecked",
+        "-Xlint",
+        "-Xfatal-warnings",
+        "-Yno-adapted-args")
+  }
+  else {
+    Seq("-deprecation",
+        "-encoding", "UTF-8",
+        "-feature",
+        "-language:higherKinds",
+        "-language:implicitConversions",
+        "-language:postfixOps",
+        "-unchecked",
+        "-Xfatal-warnings",
+        "-Xlint:_",
+        "-Yno-adapted-args",
+        "-Ywarn-adapted-args",
+        "-Ywarn-dead-code",
+        "-Ywarn-inaccessible",
+        "-Ywarn-infer-any",
+        "-Ywarn-nullary-override",
+        "-Ywarn-nullary-unit",
+        "-Ywarn-numeric-widen",
+        "-Ywarn-unused",
+        "-Ywarn-unused-import",
+        "-Ywarn-value-discard")
+  }
+}
 
 publishTo <<= version.apply { v =>
   val nexus = "https://oss.sonatype.org/"