Merge pull request #1859 from sbt/wip/publish-status-fix

Fix nightly publishing location by demoting publish-status to ThisBuild

build.sbt

@@ -30,7 +30,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
 )
 
 def minimalSettings: Seq[Setting[_]] =
-  commonSettings ++ customCommands ++ Status.settings ++
+  commonSettings ++ customCommands ++
   publishPomSettings ++ Release.javaVersionCheckSettings
 
 def baseSettings: Seq[Setting[_]] =

project/Docs.scala

@@ -1,6 +1,6 @@
 import sbt._
 import Keys._
-import Status.publishStatus
+import StatusPlugin.autoImport._
 import com.typesafe.sbt.{ SbtGhPages, SbtGit, SbtSite, site => sbtsite }
 import SbtSite.{ site, SiteKeys }
 import SbtGhPages.{ ghpages, GhPagesKeys => ghkeys }

project/Release.scala

@@ -1,6 +1,6 @@
 import sbt._
 import Keys._
-import Status.publishStatus
+import StatusPlugin.autoImport._
 import org.apache.ivy.util.url.CredentialsStore
 import com.typesafe.sbt.JavaVersionCheckPlugin.autoImport._
 

project/StatusPlugin.scala

@@ -2,10 +2,17 @@ import sbt._
 import Keys._
 import java.util.regex.Pattern
 
-object Status {
-  lazy val publishStatus = SettingKey[String]("publish-status")
+object StatusPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
 
-  def settings: Seq[Setting[_]] = Seq(
+  object autoImport {
+    lazy val publishStatus = SettingKey[String]("publish-status")
+  }
+
+  import autoImport._
+
+  override def buildSettings: Seq[Setting[_]] = Seq(
     isSnapshot <<= version(v => v.contains("-") && snapshotQualifier(v)),
     publishStatus <<= isSnapshot { snap => if (snap) "snapshots" else "releases" },
     commands += stampVersion
@@ -35,4 +42,4 @@ object Status {
   // NOte: This moved into sbt itself...  But we need to add semantic knowledge of how
   // we stamp our nightlies.
   def snapshotQualifier(v: String) = Pattern.matches(""".+-.*SNAPSHOT.*""", v)
-}
+}