Upgrade to sbt-0.13.2. Add sbt-pgp plugin to publish to sonatype

xerial · xerial · commit cc59dc162ecc · 2014-06-05T10:17:02.000+09:00
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.msgpack</groupId>
-    <artifactId>msgpack-root</artifactId>
+    <artifactId>msgpack-java</artifactId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
diff --git a/project/Build.scala b/project/Build.scala
@@ -22,19 +22,23 @@ import xerial.sbt.Sonatype._
 import de.johoop.findbugs4sbt.FindBugs._
 import de.johoop.jacoco4sbt._
 import JacocoPlugin._
+import sbtrelease.ReleasePlugin._
 
 object Build extends Build {
 
   val SCALA_VERSION = "2.10.3"
 
-  lazy val buildSettings = Defaults.defaultSettings ++ findbugsSettings ++ jacoco.settings ++
+  lazy val buildSettings = Defaults.defaultSettings ++
+    releaseSettings ++
+    findbugsSettings ++
+    jacoco.settings ++
+    sonatypeSettings ++
     Seq[Setting[_]](
       organization := "org.msgpack",
       organizationName := "MessagePack",
       organizationHomepage := Some(new URL("http://msgpack.org/")),
       description := "MessagePack for Java",
       scalaVersion in Global := SCALA_VERSION,
-      sbtVersion in Global := "0.13.2-M1",
       logBuffered in Test := false,
       //parallelExecution in Test := false,
       autoScalaLibrary := false,
@@ -80,6 +84,9 @@ object Build extends Build {
       findbugs := {
         // do not run findbugs for the root project
       }
+      // Do not publish root project
+      //publish := {},
+      //publishLocal := {}
     )
   ) aggregate(msgpackCore, msgpackValue)
 
diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=0.13.2-M3
+sbt.version=0.13.2
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,9 @@
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.7.1")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
 
 addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-sbt.version=0.13.2-M3`
	`1`	`+sbt.version=0.13.2`
`2`	`2`