Using sbt-sonatype-0.4.0, which simplifies settings

xerial · xerial · commit 0ad5b4d84d52 · 2015-05-04T02:14:35.000+09:00
diff --git a/project/Build.scala b/project/Build.scala
@@ -26,8 +26,7 @@ import sbtrelease.ReleaseStateTransformations._
 import sbtrelease.ReleaseStep
 import scala.util.Properties
 import com.typesafe.sbt.pgp.PgpKeys
-import xerial.sbt.Sonatype
-import Sonatype.SonatypeKeys._
+import xerial.sbt.Sonatype.SonatypeKeys._
 
 object Build extends Build {
 
@@ -94,21 +93,19 @@ object Build extends Build {
 
   import Dependencies._
 
-
   lazy val root = Project(
     id = "msgpack-java",
     base = file("."),
     settings = buildSettings ++ Seq(
-      findbugs := {
-        // do not run findbugs for the root project
-      },
       // Do not publish the root project
       publishArtifact := false,
       publish := {},
-      publishLocal := {}
+      publishLocal := {},
+      findbugs := {
+        // do not run findbugs for the root project
+      }
     )
-  ) aggregate(msgpackCore, msgpackJackson)
-
+  ).aggregate(msgpackCore, msgpackJackson)
 
   lazy val msgpackCore = Project(
     id = "msgpack-core",
@@ -117,7 +114,7 @@ object Build extends Build {
       description := "Core library of the MessagePack for Java",
       libraryDependencies ++= testLib
     )
-  ).disablePlugins(Sonatype)
+  )
 
   lazy val msgpackJackson = Project(
     id = "msgpack-jackson",
@@ -128,7 +125,7 @@ object Build extends Build {
       libraryDependencies ++= jacksonLib,
       testOptions += Tests.Argument(TestFrameworks.JUnit, "-v")
     )
-  ).disablePlugins(Sonatype).dependsOn(msgpackCore)
+  ).dependsOn(msgpackCore)
 
   object Dependencies {
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.3.3")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.4.0")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
 
diff --git a/sonatype.sbt b/sonatype.sbt
@@ -1,4 +1,4 @@
-import SonatypeKeys._
+Sonatype.sonatypeSettings
 
 sonatypeProfileName := "org.msgpack"
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import SonatypeKeys._`
	`1`	`+Sonatype.sonatypeSettings`
`2`	`2`
`3`	`3`	`sonatypeProfileName := "org.msgpack"`
`4`	`4`