From ac99d84530c02078c62e743750084cf2972caed2 Mon Sep 17 00:00:00 2001
From: Andrew Richards <richards.aj@gmail.com>
Date: Mon, 19 Feb 2018 21:47:31 +0000
Subject: Better error messages when publishing to Sonatype (#138)

---
 scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala   | 3 +++
 scalalib/src/mill/scalalib/publish/SonatypePublisher.scala | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scalalib')

diff --git a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala
index ca78f893..0b5785a5 100644
--- a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala
+++ b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala
@@ -30,6 +30,7 @@ class SonatypeHttpApi(uri: String, credentials: String) {
   def getStagingProfileUri(groupId: String): String = {
     val response = withRetry(
       PatientHttp(s"$uri/staging/profiles").headers(commonHeaders))
+        .throwError
 
     val resourceUri =
       json
@@ -49,6 +50,7 @@ class SonatypeHttpApi(uri: String, credentials: String) {
       .option(HttpOptions.readTimeout(60000))
       .headers(commonHeaders)
       .asString
+      .throwError
 
     json.read(response.body)("type").str.toString
   }
@@ -59,6 +61,7 @@ class SonatypeHttpApi(uri: String, credentials: String) {
       .headers(commonHeaders)
       .postData(
         s"""{"data": {"description": "fresh staging profile for ${groupId}"}}"""))
+      .throwError
 
     json.read(response.body)("data")("stagedRepositoryId").str.toString
   }
diff --git a/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala b/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala
index 4d03e182..ad0373c1 100644
--- a/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala
+++ b/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala
@@ -106,7 +106,7 @@ class SonatypePublisher(uri: String,
   private def reportPublishResults(publishResults: Seq[HttpResponse[String]],
                                    artifacts: Seq[Artifact]) = {
     if (publishResults.forall(_.is2xx)) {
-      log.info(s"Published v${artifacts.map(_.id).mkString(", ")} to Sonatype")
+      log.info(s"Published ${artifacts.map(_.id).mkString(", ")} to Sonatype")
     } else {
       val errors = publishResults.filterNot(_.is2xx).map { response =>
         s"Code: ${response.code}, message: ${response.body}"
-- 
cgit v1.2.3