From b328e1062cbc45c5966f7384c84f44e5fade8c79 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sat, 7 Apr 2018 11:38:17 -0700 Subject: clean up JavaModule/ScalaModule interactions and consolidate extensions into new resolveFooDependency methods --- build.sc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 1890edf2..ee5777c4 100755 --- a/build.sc +++ b/build.sc @@ -11,7 +11,7 @@ import publish._ import mill.modules.Jvm.createAssembly import upickle.Js trait MillPublishModule extends PublishModule{ - def scalaVersion = "2.12.4" + def artifactName = "mill-" + super.artifactName() def publishVersion = build.publishVersion()._2 @@ -27,17 +27,18 @@ trait MillPublishModule extends PublishModule{ ) def javacOptions = Seq("-source", "1.8", "-target", "1.8") - } -object moduledefs extends MillPublishModule{ + +object moduledefs extends MillPublishModule with ScalaModule{ + def scalaVersion = T{ "2.12.4" } def ivyDeps = Agg( ivy"org.scala-lang:scala-compiler:${scalaVersion()}", ivy"com.lihaoyi::sourcecode:0.1.4" ) } -trait MillModule extends MillPublishModule{ outer => - +trait MillModule extends MillPublishModule with ScalaModule{ outer => + def scalaVersion = T{ "2.12.4" } def compileIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7") def scalacOptions = Seq("-P:acyclic:force") def scalacPluginIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7") -- cgit v1.2.3