diff options
Diffstat (limited to 'scalalib')
-rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 4 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/ScalaWorkerApi.scala | 6 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 7e4217e7..a2ca2214 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -398,7 +398,7 @@ trait TestModule extends ScalaModule with TaskModule { workingDir = forkWorkingDir ) - val jsonOutput = upickle.json.read(outputPath.toIO) + val jsonOutput = ujson.read(outputPath.toIO) val (doneMsg, results) = upickle.default.readJs[(String, Seq[TestRunner.Result])](jsonOutput) TestModule.handleResults(doneMsg, results) @@ -413,7 +413,7 @@ trait TestModule extends ScalaModule with TaskModule { args ) - val jsonOutput = upickle.json.read(outputPath.toIO) + val jsonOutput = ujson.read(outputPath.toIO) val (doneMsg, results) = upickle.default.readJs[(String, Seq[TestRunner.Result])](jsonOutput) TestModule.handleResults(doneMsg, results) diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala index a3760aed..9739089a 100644 --- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala +++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala @@ -16,7 +16,11 @@ object ScalaWorkerModule extends mill.define.ExternalModule with ScalaWorkerModu lazy val millDiscover = Discover[this.type] } trait ScalaWorkerModule extends mill.Module{ - def repositories = Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")) + def repositories = Seq( + Cache.ivy2Local, + MavenRepository("https://repo1.maven.org/maven2"), + MavenRepository("https://oss.sonatype.org/content/repositories/releases") + ) def classpath = T{ val scalaWorkerJar = sys.props("MILL_SCALA_WORKER") diff --git a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala index 0b5785a5..927d4515 100644 --- a/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala +++ b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala @@ -2,7 +2,7 @@ package mill.scalalib.publish import java.util.Base64 -import upickle.json + import scala.concurrent.duration._ import scalaj.http.{BaseHttp, HttpOptions, HttpRequest, HttpResponse} @@ -33,7 +33,7 @@ class SonatypeHttpApi(uri: String, credentials: String) { .throwError val resourceUri = - json + ujson .read(response.body)("data") .arr .find(profile => profile("name").str == groupId) @@ -52,7 +52,7 @@ class SonatypeHttpApi(uri: String, credentials: String) { .asString .throwError - json.read(response.body)("type").str.toString + ujson.read(response.body)("type").str.toString } // https://oss.sonatype.org/nexus-staging-plugin/default/docs/path__staging_profiles_-profileIdKey-_start.html @@ -63,7 +63,7 @@ class SonatypeHttpApi(uri: String, credentials: String) { s"""{"data": {"description": "fresh staging profile for ${groupId}"}}""")) .throwError - json.read(response.body)("data")("stagedRepositoryId").str.toString + ujson.read(response.body)("data")("stagedRepositoryId").str.toString } // https://oss.sonatype.org/nexus-staging-plugin/default/docs/path__staging_profiles_-profileIdKey-_finish.html |