diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-03-24 15:23:46 -0700 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-03-24 15:23:46 -0700 |
| commit | bdb82a92c4340898b43525dbad44990a119d2b0f (patch) | |
| tree | c65e18e5e12cdb4e6318d9ccfba6297d4eed7227 /scalalib/src | |
| parent | 8aaf9b8de0d1d64e12b97017ae70e51fd0ab632f (diff) | |
| download | mill-bdb82a92c4340898b43525dbad44990a119d2b0f.tar.gz mill-bdb82a92c4340898b43525dbad44990a119d2b0f.tar.bz2 mill-bdb82a92c4340898b43525dbad44990a119d2b0f.zip | |
update to latest Ammonite using latest upickle RC
Diffstat (limited to 'scalalib/src')
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 4 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index b5106e3e..0a72f4c8 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/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 |