= Upgrade dependencies, enable Scala 2.12 crossbuild

1 files changed, 24 insertions, 13 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