From 33deeea8b372e2c5b941e7c547470a98e32692b1 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Mon, 4 Aug 2014 11:08:29 -0400 Subject: [PATCH] Fix nightly push to go to snapshot repository. --- project/Release.scala | 2 +- project/Status.scala | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/project/Release.scala b/project/Release.scala index a7633e5e3..24ee71230 100644 --- a/project/Release.scala +++ b/project/Release.scala @@ -34,7 +34,7 @@ object Release extends Build { ) ++ lameCredentialSettings ++ javaVersionCheckSettings def snapshotPattern(version: String) = Resolver.localBasePattern.replaceAll("""\[revision\]""", version) - def publishResolver: Project.Initialize[Option[Resolver]] = (remoteID, remoteBase) { (id, base) => + def publishResolver: Def.Initialize[Option[Resolver]] = (remoteID, remoteBase) { (id, base) => Some(Resolver.url("publish-" + id, url(base))(Resolver.ivyStylePatterns)) } diff --git a/project/Status.scala b/project/Status.scala index 73ef5ab66..1a5ebb7d4 100644 --- a/project/Status.scala +++ b/project/Status.scala @@ -11,7 +11,15 @@ object Status { commands += stampVersion ) def stampVersion = Command.command("stamp-version") { state => - Project.extract(state).append((version in ThisBuild ~= stamp) :: Nil, state) + val extracted = Project.extract(state) + val status = extracted.get(publishStatus) + // Set new version AND lock down the publishStatus to what it was, as + // our release regexes no longer support ivy data format, due to other issues. + extracted.append( + (version in ThisBuild ~= stamp) :: + (publishStatus in ThisBuild := status) :: + Nil, + state) } def stamp(v: String): String = if (v endsWith Snapshot)