From 950ffd95bc5bb710b95a13a39d7b190d8f3f50bf Mon Sep 17 00:00:00 2001 From: Sequencer Date: Sat, 28 Sep 2019 02:48:28 +0800 Subject: [PATCH] Fix compilation failure in mill 0.5.1 (#23) * (maybe) fix compile failed in mill 0.5.1: current master version will compile failed by "mill.eval.Evaluator does not take type parameters" This change `Evaluator[Any]` to `Evaluator` and explicitly give the `crossVersion` in `build.sh` * update for review --- build.sc | 6 +++++- build.sh | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build.sc b/build.sc index 3a1dd53..698d8e1 100644 --- a/build.sc +++ b/build.sc @@ -44,7 +44,7 @@ val crossVersions = Seq("2.12.7", "2.11.12") // Make this available to external tools. object diagrammer extends Cross[DiagrammerModule](crossVersions: _*) { - def defaultVersion(ev: Evaluator[Any]) = T.command{ + def defaultVersion(ev: Evaluator) = T.command{ println(crossVersions.head) } @@ -67,6 +67,10 @@ object diagrammer extends Cross[DiagrammerModule](crossVersions: _*) { def docJar = T{ diagrammer(crossVersions.head).docJar() } + + def assembly = T{ + diagrammer(crossVersions.head).assembly() + } } // Provide a managed dependency on X if -DXVersion="" is supplied on the command line. diff --git a/build.sh b/build.sh index 2ef16d0..9f7a8cd 100755 --- a/build.sh +++ b/build.sh @@ -2,6 +2,7 @@ # Proof-of-concept mill build that can be used with ammonite. # TODO: make this single file and add maven version +# test success in mill 0.5.1 mill diagrammer.assembly -cp out/diagrammer/assembly/dest/out.jar diagrammer.jar +find -wholename "*assembly/dest/out.jar" -exec cp {} ./diagrammer.jar \; echo "./firrtl-diagrammer is ready to run"