diff options
| -rwxr-xr-x | build.sc | 4 | ||||
| -rw-r--r-- | main/src/mill/main/RunScript.scala | 2 | ||||
| -rw-r--r-- | main/test/src/mill/util/TestUtil.scala | 2 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 4 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala | 8 |
5 files changed, 10 insertions, 10 deletions
@@ -69,7 +69,7 @@ trait MillModule extends MillPublishModule{ outer => object clientserver extends MillModule{ def ivyDeps = Agg( - ivy"com.lihaoyi:::ammonite:1.0.5-11-70bf3f2", + ivy"com.lihaoyi:::ammonite:1.0.5-14-daf7e0d", ivy"com.lihaoyi::upickle:0.6.0-RC6", ivy"org.scala-sbt.ipcsocket:ipcsocket:1.0.0" ) @@ -85,7 +85,7 @@ object core extends MillModule { def ivyDeps = Agg( ivy"com.lihaoyi::sourcecode:0.1.4", - ivy"com.lihaoyi:::ammonite:1.0.5-11-70bf3f2", + ivy"com.lihaoyi:::ammonite:1.0.5-14-daf7e0d", ivy"com.lihaoyi::upickle:0.6.0-RC6", ivy"jline:jline:2.14.5" ) diff --git a/main/src/mill/main/RunScript.scala b/main/src/mill/main/RunScript.scala index 4d8653fb..77930cc8 100644 --- a/main/src/mill/main/RunScript.scala +++ b/main/src/mill/main/RunScript.scala @@ -225,7 +225,7 @@ object RunScript{ val jsonFile = Evaluator .resolveDestPaths(evaluator.outPath, t.ctx.segments) .meta - val metadata = upickle.default.readJs[Evaluator.Cached](upickle.json.read(jsonFile.toIO)) + val metadata = upickle.default.readJs[Evaluator.Cached](ujson.read(jsonFile.toIO)) Some(metadata.v) case _ => None diff --git a/main/test/src/mill/util/TestUtil.scala b/main/test/src/mill/util/TestUtil.scala index d0caade7..dede8bcf 100644 --- a/main/test/src/mill/util/TestUtil.scala +++ b/main/test/src/mill/util/TestUtil.scala @@ -65,7 +65,7 @@ object TestUtil { (implicit ctx0: mill.define.Ctx) extends Test(inputs) with Target[Int]{ val ctx = ctx0.copy(segments = ctx0.segments ++ Seq(ctx0.segment)) - val readWrite = upickle.default.IntRW + val readWrite = upickle.default.readwriter[Int] } 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 |