diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-10 08:52:04 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-10 08:52:04 -0800 |
| commit | 2e80b3ae15466ea82a4f8ffa016dee1ee8a62825 (patch) | |
| tree | dbb2019dc301d63cb13c60d2d46125f4977026a0 /scalalib/src | |
| parent | fb7d39ad7f6dee1580bd30ec96ae494d97f146f1 (diff) | |
| download | mill-2e80b3ae15466ea82a4f8ffa016dee1ee8a62825.tar.gz mill-2e80b3ae15466ea82a4f8ffa016dee1ee8a62825.tar.bz2 mill-2e80b3ae15466ea82a4f8ffa016dee1ee8a62825.zip | |
move docs around, try to fix publishAll
Diffstat (limited to 'scalalib/src')
| -rw-r--r-- | scalalib/src/mill/scalalib/PublishModule.scala | 5 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scalalib/src/mill/scalalib/PublishModule.scala b/scalalib/src/mill/scalalib/PublishModule.scala index 8f52eb6a..611e2540 100644 --- a/scalalib/src/mill/scalalib/PublishModule.scala +++ b/scalalib/src/mill/scalalib/PublishModule.scala @@ -98,9 +98,10 @@ object PublishModule extends ExternalModule{ def publishAll(sonatypeCreds: String, gpgPassphrase: String, publishArtifacts: mill.main.Tasks[PublishModule.PublishData], + release: Boolean = false, sonatypeUri: String = "https://oss.sonatype.org/service/local", - sonatypeSnapshotUri: String = "https://oss.sonatype.org/content/repositories/snapshots", - release: Boolean = false) = T.command{ + sonatypeSnapshotUri: String = "https://oss.sonatype.org/content/repositories/snapshots") = T.command{ + val x: Seq[(Seq[(Path, String)], Artifact)] = Task.sequence(publishArtifacts.value)().map{ case PublishModule.PublishData(a, s) => (s.map{case (p, f) => (p.path, f)}, a) } diff --git a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala index 8ccdf3ea..ca78f893 100644 --- a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala +++ b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala @@ -21,7 +21,7 @@ class SonatypeHttpApi(uri: String, credentials: String) { private val base64Creds = base64(credentials) private val commonHeaders = Seq( - "Authorization" -> s"Basic ${base64Creds}", + "Authorization" -> s"Basic $base64Creds", "Accept" -> "application/json", "Content-Type" -> "application/json" ) @@ -29,7 +29,7 @@ class SonatypeHttpApi(uri: String, credentials: String) { // https://oss.sonatype.org/nexus-staging-plugin/default/docs/path__staging_profiles.html def getStagingProfileUri(groupId: String): String = { val response = withRetry( - PatientHttp(s"${uri}/staging/profiles").headers(commonHeaders)) + PatientHttp(s"$uri/staging/profiles").headers(commonHeaders)) val resourceUri = json |