Skip to content

Commit 760620e

Browse files
author
Nathan Hamblen
committed
Drop Scala 2.9 support
It's time! Also fix an sbt deprecation warning.
1 parent a8d89be commit 760620e

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

liftjson/build.sbt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,9 @@ name := "dispatch-lift-json"
33
description :=
44
"Dispatch module providing lift json support"
55

6-
seq(lsSettings :_*)
7-
8-
(skip in compile) <<= scalaVersion { sv => () => sv == "2.9.3" }
9-
10-
publishArtifact <<= scalaVersion { sv => sv != "2.9.3" }
6+
Seq(lsSettings :_*)
117

128
libraryDependencies ++= Seq(
13-
"net.liftweb" %% "lift-json" % "2.6" cross CrossVersion.binaryMapped {
14-
// Makes update resolution happy, but since w'ere not building for 2.9.3
15-
// we won't end up in runtime version hell by doing this.
16-
case "2.9.3" => "2.9.1"
17-
case x => x
18-
},
9+
"net.liftweb" %% "lift-json" % "2.6",
1910
"org.mockito" % "mockito-core" % "1.10.19" % "test"
2011
)

project/common.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object Common {
1515
val settings: Seq[Setting[_]] = ls.Plugin.lsSettings ++ Seq(
1616
version := "0.11.3",
1717

18-
crossScalaVersions := Seq("2.9.3", "2.10.4", "2.11.5"),
18+
crossScalaVersions := Seq("2.10.4", "2.11.5"),
1919

2020
scalaVersion := defaultScalaVersion,
2121

0 commit comments

Comments
 (0)