Skip to content

Commit

Permalink
Fix compilation failure in mill 0.5.1 (#23)
Browse files Browse the repository at this point in the history
* (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
  • Loading branch information
sequencer authored and edwardcwang committed Sep 27, 2019
1 parent febebf1 commit 950ffd9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 5 additions & 1 deletion build.sc
Expand Up @@ -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)
}

Expand All @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion build.sh
Expand Up @@ -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"

0 comments on commit 950ffd9

Please sign in to comment.