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 /main | |
| 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 'main')
| -rw-r--r-- | main/src/mill/main/RunScript.scala | 2 | ||||
| -rw-r--r-- | main/test/src/mill/util/TestUtil.scala | 2 |
2 files changed, 2 insertions, 2 deletions
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] } |