From 4fbde3a833cb122c71aaf85a1b3bbd31e130cb62 Mon Sep 17 00:00:00 2001
From: Mathias <mathias@spray.io>
Date: Wed, 17 Feb 2016 10:44:30 +0100
Subject: = Upgrade dependencies, enable Scala 2.12 crossbuild

---
 build.sbt                                      | 37 +++++++++++++++++---------
 project/build.properties                       |  2 +-
 project/plugins.sbt                            |  4 ++-
 src/test/scala/spray/json/RoundTripSpecs.scala |  4 +--
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/build.sbt b/build.sbt
index 5230ba6..395c80f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,16 +14,16 @@ startYear := Some(2011)
 
 licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
 
-scalaVersion := "2.11.6"
+scalaVersion := "2.11.7"
 
 scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-encoding", "utf8")
 
 resolvers += Opts.resolver.sonatypeReleases
 
 libraryDependencies ++= Seq(
-  "org.specs2" %% "specs2-core" % "2.4.16" % "test",
-  "org.specs2" %% "specs2-scalacheck" % "2.4.16" % "test",
-  "org.scalacheck" %% "scalacheck" % "1.12.2" % "test"
+  "org.specs2" %% "specs2-core" % "3.7.1" % "test",
+  "org.specs2" %% "specs2-scalacheck" % "3.7.1" % "test",
+  "org.scalacheck" %% "scalacheck" % "1.12.5" % "test"
 )
 
 (scalacOptions in doc) ++= Seq("-doc-title", name.value + " " + version.value)
@@ -46,17 +46,28 @@ OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-
 // publishing
 ///////////////
 
-crossScalaVersions := Seq("2.10.5", "2.11.6")
+crossScalaVersions := Seq("2.10.5", "2.11.7", "2.12.0-M3")
 
 scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)
 
 publishMavenStyle := true
 
-publishTo := Some {
-    "spray repo" at {
-      // public uri is repo.spray.io, we use an SSH tunnel to the nexus here
-      "http://localhost:42424/content/repositories/" + {
-        if (version.value.trim.endsWith("SNAPSHOT")) "snapshots/" else "releases/"
-      }
-    }
-  }
\ No newline at end of file
+useGpg := true
+
+publishTo <<= version { v: String =>
+  val nexus = "https://oss.sonatype.org/"
+  if (v.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
+  else                             Some("releases" at nexus + "service/local/staging/deploy/maven2")
+}
+
+pomIncludeRepository := { _ => false }
+
+pomExtra :=
+  <scm>
+    <url>git://github.com/spray/spray.git</url>
+    <connection>scm:git:git@github.com:spray/spray.git</connection>
+  </scm>
+  <developers>
+    <developer><id>sirthias</id><name>Mathias Doenitz</name></developer>
+    <developer><id>jrudolph</id><name>Johannes Rudolph</name></developer>
+  </developers>
\ No newline at end of file
diff --git a/project/build.properties b/project/build.properties
index a6e117b..817bc38 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 0db6254..b2c7588 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,5 @@
 addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.9")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
\ No newline at end of file
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
+
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
\ No newline at end of file
diff --git a/src/test/scala/spray/json/RoundTripSpecs.scala b/src/test/scala/spray/json/RoundTripSpecs.scala
index c4f7764..24b2354 100644
--- a/src/test/scala/spray/json/RoundTripSpecs.scala
+++ b/src/test/scala/spray/json/RoundTripSpecs.scala
@@ -2,7 +2,7 @@ package spray.json
 
 import org.specs2.mutable.Specification
 import org.scalacheck._
-import org.specs2.matcher.ScalaCheckMatchers
+import org.specs2.ScalaCheck
 
 object JsValueGenerators {
   import Gen._
@@ -47,7 +47,7 @@ object JsValueGenerators {
   implicit val arbitraryValue: Arbitrary[JsValue] = Arbitrary(genValue(5))
 }
 
-class RoundTripSpecs extends Specification with ScalaCheckMatchers {
+class RoundTripSpecs extends Specification with ScalaCheck {
   import JsValueGenerators.arbitraryValue
 
   "Parsing / Printing round-trip" should {
-- 
cgit v1.2.3