Skip to content

Commit 73345de

Browse files
committed
Upgrade SBT and plugins, remove Scala 2.9 support, bump version to 1.3-SNAPSHOT
1 parent 8dc25d6 commit 73345de

7 files changed

Lines changed: 17 additions & 134 deletions

File tree

build.sbt

Lines changed: 14 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name := "spray-json"
22

3-
version := "1.2.6"
3+
version := "1.3.0-SNAPSHOT"
44

55
organization := "io.spray"
66

@@ -14,33 +14,19 @@ startYear := Some(2011)
1414

1515
licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
1616

17-
scalaVersion := "2.11.0"
17+
scalaVersion := "2.11.2"
1818

19-
scalacOptions <<= scalaVersion map {
20-
case "2.9.3" => Seq("-unchecked", "-deprecation", "-encoding", "utf8")
21-
case _ => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8")
22-
}
19+
scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-encoding", "utf8")
2320

2421
resolvers += Opts.resolver.sonatypeReleases
2522

26-
libraryDependencies ++= {
27-
Seq("org.parboiled" %% "parboiled-scala" % "1.1.6" % "compile") ++
28-
(scalaVersion.value match {
29-
case "2.9.3" =>
30-
Seq(
31-
"org.specs2" %% "specs2" % "1.12.4.1" % "test",
32-
"org.scalacheck" %% "scalacheck" % "1.10.0" % "test"
33-
)
34-
// Scala 2.10 and Scala 2.11
35-
case _ =>
36-
Seq(
37-
"org.specs2" %% "specs2" % "2.3.11" % "test",
38-
"org.scalacheck" %% "scalacheck" % "1.11.3" % "test"
39-
)
40-
})
41-
}
42-
43-
(scalacOptions in doc) <<= (name, version).map { (n, v) => Seq("-doc-title", n + " " + v) }
23+
libraryDependencies ++= Seq(
24+
"org.parboiled" %% "parboiled-scala" % "1.1.6" % "compile",
25+
"org.specs2" %% "specs2" % "2.4.2" % "test",
26+
"org.scalacheck" %% "scalacheck" % "1.11.5" % "test"
27+
)
28+
29+
(scalacOptions in doc) ++= Seq("-doc-title", name.value + " " + version.value)
4430

4531
// generate boilerplate
4632
Boilerplate.settings
@@ -60,32 +46,17 @@ OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-
6046
// publishing
6147
///////////////
6248

63-
crossScalaVersions := Seq("2.9.3", "2.10.4", "2.11.0")
49+
crossScalaVersions := Seq("2.10.4", "2.11.2")
6450

6551
scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)
6652

6753
publishMavenStyle := true
6854

69-
publishTo <<= version { version =>
70-
Some {
55+
publishTo := Some {
7156
"spray repo" at {
7257
// public uri is repo.spray.io, we use an SSH tunnel to the nexus here
7358
"http://localhost:42424/content/repositories/" + {
74-
if (version.trim.endsWith("SNAPSHOT")) "snapshots/" else"releases/"
59+
if (version.value.trim.endsWith("SNAPSHOT")) "snapshots/" else "releases/"
7560
}
7661
}
77-
}
78-
}
79-
80-
81-
///////////////
82-
// ls-sbt
83-
///////////////
84-
85-
seq(lsSettings:_*)
86-
87-
(LsKeys.tags in LsKeys.lsync) := Seq("json")
88-
89-
(LsKeys.docsUrl in LsKeys.lsync) := Some(new URL("http://spray.github.com/spray/api/spray-json/"))
90-
91-
(externalResolvers in LsKeys.lsync) := Seq("spray repo" at "http://repo.spray.io")
62+
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.2
1+
sbt.version=0.13.6

project/plugins.sbt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3")
1+
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.9")
22

3-
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.1")
4-
5-
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
3+
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")

src/main/ls/1.1.0.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/ls/1.1.1.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/ls/1.2.2.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/main/ls/1.2.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)