From e9bfcdfc5895a8fbde89179289430d4ffccfb7ed Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 13 Apr 2012 18:09:26 -0400 Subject: [PATCH] 0.12.0-Beta --- project/Sbt.scala | 2 +- project/Status.scala | 4 ++-- src/main/conscript/sbt/launchconfig | 4 ++-- src/main/conscript/scalas/launchconfig | 4 ++-- src/main/conscript/screpl/launchconfig | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project/Sbt.scala b/project/Sbt.scala index 65f79d030..1a7297f38 100644 --- a/project/Sbt.scala +++ b/project/Sbt.scala @@ -15,7 +15,7 @@ object Sbt extends Build override lazy val settings = super.settings ++ buildSettings ++ Status.settings def buildSettings = Seq( organization := "org.scala-sbt", - version := "0.12.0-SNAPSHOT", + version := "0.12.0-Beta", publishArtifact in packageDoc := false, scalaVersion := "2.9.2", publishMavenStyle := false, diff --git a/project/Status.scala b/project/Status.scala index 36d4b8a6b..7ed5b0df4 100644 --- a/project/Status.scala +++ b/project/Status.scala @@ -8,7 +8,7 @@ object Status lazy val publishStatus = SettingKey[String]("publish-status") def settings: Seq[Setting[_]] = Seq( - isSnapshot <<= version(v => v.contains("-") && !isMilestone(v)), + isSnapshot <<= version(v => v.contains("-") && snapshotQualifier(v)), publishStatus <<= isSnapshot { snap => if(snap) "snapshots" else "releases" }, commands += stampVersion ) @@ -26,5 +26,5 @@ object Status format.format(new java.util.Date(time)) } final val Snapshot = "-SNAPSHOT" - def isMilestone(v: String) = Pattern.matches(""".+-M\d+""", v) + def snapshotQualifier(v: String) = !Pattern.matches(""".+-(M|Alpha|Beta|RC)\d*""", v) } \ No newline at end of file diff --git a/src/main/conscript/sbt/launchconfig b/src/main/conscript/sbt/launchconfig index a91393272..e9161a17a 100644 --- a/src/main/conscript/sbt/launchconfig +++ b/src/main/conscript/sbt/launchconfig @@ -1,10 +1,10 @@ [scala] - version: 2.9.1 + version: auto [app] org: org.scala-sbt name: sbt - version: read(sbt.version)[0.12.0-SNAPSHOT] + version: read(sbt.version)[0.12.0-Beta] class: ${sbt.main.class-sbt.xMain} components: xsbti cross-versioned: true diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig index 149c98163..546746f77 100644 --- a/src/main/conscript/scalas/launchconfig +++ b/src/main/conscript/scalas/launchconfig @@ -1,10 +1,10 @@ [scala] - version: 2.9.1 + version: auto [app] org: org.scala-sbt name: sbt - version: 0.12.0-SNAPSHOT + version: 0.12.0-Beta class: sbt.ScriptMain components: xsbti cross-versioned: true diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index d8570e91f..d3a05eac4 100644 --- a/src/main/conscript/screpl/launchconfig +++ b/src/main/conscript/screpl/launchconfig @@ -1,10 +1,10 @@ [scala] - version: 2.9.1 + version: auto [app] org: org.scala-sbt name: sbt - version: 0.12.0-SNAPSHOT + version: 0.12.0-Beta class: sbt.ConsoleMain components: xsbti cross-versioned: true