From 908c6ec66e3878a040f21215417673480383b078 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Thu, 26 May 2016 09:48:21 -0400 Subject: Publish to right destination based on version suffix --- stage2/Lib.scala | 2 +- stage2/PublishBuild.scala | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'stage2') diff --git a/stage2/Lib.scala b/stage2/Lib.scala index 2523735..acd62c8 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -369,7 +369,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ else items.map(projection) } - def publishSnapshot( sourceFiles: Seq[File], artifacts: Seq[File], url: URL, credentials: String ): Unit = { + def publishUnsigned( sourceFiles: Seq[File], artifacts: Seq[File], url: URL, credentials: String ): Unit = { if(sourceFiles.nonEmpty){ val files = artifacts.map(nameAndContents) uploadAll(url, files, credentials) diff --git a/stage2/PublishBuild.scala b/stage2/PublishBuild.scala index 60e3853..ea6fa0d 100644 --- a/stage2/PublishBuild.scala +++ b/stage2/PublishBuild.scala @@ -36,8 +36,9 @@ abstract class PublishBuild(context: Context) extends PackageBuild(context){ // ========== publish ========== final protected def releaseFolder = s"/${groupId.replace(".","/")}/${artifactId}_$scalaMajorVersion/$version/" - def snapshotUrl = new URL("https://oss.sonatype.org/content/repositories/snapshots") - def releaseUrl = new URL("https://oss.sonatype.org/service/local/staging/deploy/maven2") + private def snapshotUrl = new URL("https://oss.sonatype.org/content/repositories/snapshots") + private def releaseUrl = new URL("https://oss.sonatype.org/service/local/staging/deploy/maven2") + def publishUrl = if(version.endsWith("-SNAPSHOT")) snapshotUrl else releaseUrl override def copy(context: Context) = super.copy(context).asInstanceOf[PublishBuild] protected def sonatypeCredentials = { @@ -46,15 +47,17 @@ abstract class PublishBuild(context: Context) extends PackageBuild(context){ } def publishSnapshot: Unit = { - val snapshotBuild = copy( context.copy(version = Some(version+"-SNAPSHOT")) ) - val files = snapshotBuild.pom +: snapshotBuild.`package` - lib.publishSnapshot( - sourceFiles, files, snapshotUrl ++ releaseFolder, sonatypeCredentials + copy( context.copy(version = Some(version+"-SNAPSHOT")) ).publishUnsigned + } + + def publishUnsigned: Unit = { + lib.publishUnsigned( + sourceFiles, pom +: `package`, publishUrl ++ releaseFolder, sonatypeCredentials ) } def publishSigned: Unit = { lib.publishSigned( - sourceFiles, pom +: `package`, releaseUrl ++ releaseFolder, sonatypeCredentials + sourceFiles, pom +: `package`, publishUrl ++ releaseFolder, sonatypeCredentials ) } } -- cgit v1.2.3