Go back to bintray publishing as we are now included in the official sbt plugins repo

Revert "change to sonatype publishing for now and change organization to "net.virtual-void" for simpler administration"

This reverts commit 899fe41f1ebcab6d695618c29933888202c8225c.

Conflicts:
	README.md

6 files changed, 12 insertions, 41 deletions

diff --git a/README.md b/README.md
index 6f5ea2b..059241a 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ This now expands correctly to
 
 Put
 
-    addSbtPlugin("net.virtual-void" % "sbt-boilerplate" % "0.5.9") // CAUTION: the organization has recently been changed
+    addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.5.9")
 
 into your `plugins.sbt` and add
 
@@ -101,6 +101,6 @@ appear in `src/main/boilerplate` with the `.template` extension stripped off.
 
 ## License
 
-Copyright (c) 2012 Johannes Rudolph
+Copyright (c) 2012-2014 Johannes Rudolph
 
 Published under the [BSD 2-Clause License](http://www.opensource.org/licenses/BSD-2-Clause).
diff --git a/build.sbt b/build.sbt
index 4c27de7..577d715 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,8 +1,8 @@
 name := "sbt-boilerplate"
 
-organization := "net.virtual-void"
+organization := "io.spray"
 
-version := "0.5.9"
+version := "0.6.0-SNAPSHOT"
 
 description := "An SBT plugin for simple generation of boilerplate"
 
@@ -10,6 +10,8 @@ startYear := Some(2012)
 
 homepage := Some(url("http://github.com/sbt/sbt-boilerplate"))
 
+organizationHomepage := Some(url("http://spray.io"))
+
 licenses in GlobalScope += "BSD" -> url("https://github.com/sbt/sbt-boilerplate/raw/master/LICENSE")
 
 sbtPlugin := true
diff --git a/project/Helpers.scala b/project/Helpers.scala
deleted file mode 100644
index 4c426be..0000000
--- a/project/Helpers.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-import java.net.URL
-
-object Helpers {
-  def generatePomExtra(scmUrl: String, scmConnection: String,
-                       developerId: String, developerName: String): xml.NodeSeq =
-    <scm>
-      <url>{ scmUrl }</url>
-      <connection>{ scmConnection }</connection>
-    </scm>
-    <developers>
-      <developer>
-        <id>{ developerId }</id>
-        <name>{ developerName }</name>
-      </developer>
-    </developers>
-}
\ No newline at end of file
diff --git a/project/gpg.sbt b/project/gpg.sbt
deleted file mode 100644
index ff0f7a9..0000000
--- a/project/gpg.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
\ No newline at end of file
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 53cc650..0813d27 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,10 +1,7 @@
-resolvers ++= Seq(
-  "less is" at "http://repo.lessis.me",
-  "coda" at "http://repo.codahale.com"
-)
-
 addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3")
 
 addSbtPlugin("net.virtual-void" % "sbt-cross-building" % "0.8.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.0")
+
+addSbtPlugin("me.lessis" % "bintray-sbt" % "0.1.2")
\ No newline at end of file
diff --git a/publish.sbt b/publish.sbt
index 86c48bd..8a93f23 100644
--- a/publish.sbt
+++ b/publish.sbt
@@ -1,18 +1,7 @@
-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")
-}
+publishMavenStyle := false
 
-publishMavenStyle := true
+bintraySettings
 
-publishArtifact in Test := false
+bintray.Keys.repository := "sbt-plugins"
 
-pomIncludeRepository := { _ => false }
-
-pomExtra :=
-  Helpers.generatePomExtra("git@github.com:sbt/sbt-boilerplate.git",
-                           "scm:git:git@github.com:sbt/sbt-boilerplate.git",
-                           "jrudolph", "Johannes Rudolph")
-
-useGpg := true
+bintray.Keys.bintrayOrganization in bintray.Keys.bintray := None
\ No newline at end of file