Drop Scala 2.9 support

It's time! Also fix an sbt deprecation warning.
dispatch · May 30, 2015 · 760620e · 760620e
1 parent a8d89be
commit 760620e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/liftjson/build.sbt b/liftjson/build.sbt
@@ -3,18 +3,9 @@ name := "dispatch-lift-json"
 description :=
   "Dispatch module providing lift json support"
 
-seq(lsSettings :_*)
-
-(skip in compile) <<= scalaVersion { sv => () => sv == "2.9.3" }
-
-publishArtifact <<= scalaVersion { sv => sv != "2.9.3" }
+Seq(lsSettings :_*)
 
 libraryDependencies ++= Seq(
-  "net.liftweb" %% "lift-json" % "2.6" cross CrossVersion.binaryMapped {
-    // Makes update resolution happy, but since w'ere not building for 2.9.3
-    // we won't end up in runtime version hell by doing this.
-    case "2.9.3" => "2.9.1"
-    case x => x
-  },
+  "net.liftweb" %% "lift-json" % "2.6",
   "org.mockito" % "mockito-core" % "1.10.19" % "test"
 )
diff --git a/project/common.scala b/project/common.scala
@@ -15,7 +15,7 @@ object Common {
   val settings: Seq[Setting[_]] = ls.Plugin.lsSettings ++ Seq(
     version := "0.11.3",
 
-    crossScalaVersions := Seq("2.9.3", "2.10.4", "2.11.5"),
+    crossScalaVersions := Seq("2.10.4", "2.11.5"),
 
     scalaVersion := defaultScalaVersion,