aboutsummaryrefslogtreecommitdiff
path: root/stage2/Lib.scala
diff options
context:
space:
mode:
authorNikolay Tatarinov <rockjam@actor.im>2016-10-03 20:19:27 +0300
committerJan Christopher Vogt <oss.nsp@cvogt.org>2016-10-03 13:19:27 -0400
commit669ef3dfc3201fffa451b47d2b629a856afc0b25 (patch)
tree7bcb64c58266a4fe2dd3965dda47dc6f8fa71b04 /stage2/Lib.scala
parent174c52b2c24b8491eef687ee5eb3c3b77c34a61c (diff)
downloadcbt-669ef3dfc3201fffa451b47d2b629a856afc0b25.tar.gz
cbt-669ef3dfc3201fffa451b47d2b629a856afc0b25.tar.bz2
cbt-669ef3dfc3201fffa451b47d2b629a856afc0b25.zip
Sonatype release plugin (#247)
Diffstat (limited to 'stage2/Lib.scala')
-rw-r--r--stage2/Lib.scala11
1 files changed, 5 insertions, 6 deletions
diff --git a/stage2/Lib.scala b/stage2/Lib.scala
index c18bf2e..25183a3 100644
--- a/stage2/Lib.scala
+++ b/stage2/Lib.scala
@@ -272,6 +272,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{
} yield file
}
+ // FIXME: for some reason it includes full path in docs
def jarFile( jarFile: File, files: Seq[File], mainClass: Option[String] = None ): Option[File] = {
Files.deleteIfExists(jarFile.toPath)
if( files.isEmpty ){
@@ -430,11 +431,9 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{
}
}
- def publishSigned( sourceFiles: Seq[File], artifacts: Seq[File], url: URL, credentials: Option[String] = None ): Unit = {
+ def publishSigned( artifacts: Seq[File], url: URL, credentials: Option[String] = None ): Unit = {
// TODO: make concurrency configurable here
- if(sourceFiles.nonEmpty){
- publish( artifacts ++ artifacts.map(sign), url, credentials )
- }
+ publish( artifacts ++ artifacts.map(sign), url, credentials )
}
private def publish(artifacts: Seq[File], url: URL, credentials: Option[String]): Unit = {
@@ -450,12 +449,12 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{
}
def uploadAll(url: URL, nameAndContents: Seq[(String, Array[Byte])], credentials: Option[String] = None ): Unit =
- nameAndContents.map{ case(name, content) => upload(name, content, url, credentials ) }
+ nameAndContents.foreach { case (name, content) => upload(name, content, url, credentials ) }
def upload(fileName: String, fileContents: Array[Byte], baseUrl: URL, credentials: Option[String] = None): Unit = {
import java.net._
import java.io._
- val url = baseUrl ++ fileName
+ val url = baseUrl ++ "/" ++ fileName
System.err.println(blue("uploading ") ++ url.toString)
val httpCon = Stage0Lib.openConnectionConsideringProxy(url)
httpCon.setDoOutput(true)