diff options
-rwxr-xr-x | build.sc | 77 | ||||
-rw-r--r-- | main/core/src/mill/define/Applicative.scala (renamed from core/src/mill/define/Applicative.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/define/BaseModule.scala (renamed from core/src/mill/define/BaseModule.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/define/Cross.scala (renamed from core/src/mill/define/Cross.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/define/Ctx.scala (renamed from core/src/mill/define/Ctx.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/define/Discover.scala (renamed from core/src/mill/define/Discover.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/define/Graph.scala (renamed from core/src/mill/define/Graph.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/define/Module.scala (renamed from core/src/mill/define/Module.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/define/Task.scala (renamed from core/src/mill/define/Task.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/eval/Evaluator.scala (renamed from core/src/mill/eval/Evaluator.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/eval/PathRef.scala (renamed from core/src/mill/eval/PathRef.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/eval/Result.scala (renamed from core/src/mill/eval/Result.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/eval/Tarjans.scala (renamed from core/src/mill/eval/Tarjans.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/AggWrapper.scala (renamed from core/src/mill/util/AggWrapper.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/ClassLoader.scala (renamed from core/src/mill/util/ClassLoader.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/Ctx.scala (renamed from core/src/mill/util/Ctx.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/EitherOps.scala (renamed from core/src/mill/util/EitherOps.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/EnclosingClass.scala (renamed from core/src/mill/util/EnclosingClass.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/IO.scala (renamed from core/src/mill/util/IO.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/JsonFormatters.scala (renamed from core/src/mill/util/JsonFormatters.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/Logger.scala (renamed from core/src/mill/util/Logger.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/MultiBiMap.scala (renamed from core/src/mill/util/MultiBiMap.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/ParseArgs.scala (renamed from core/src/mill/util/ParseArgs.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/Router.scala (renamed from core/src/mill/util/Router.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/Scripts.scala (renamed from core/src/mill/util/Scripts.scala) | 0 | ||||
-rw-r--r-- | main/core/src/mill/util/Watched.scala (renamed from core/src/mill/util/Watched.scala) | 0 | ||||
-rw-r--r-- | main/moduledefs/resources/scalac-plugin.xml (renamed from core/moduledefs/resources/scalac-plugin.xml) | 0 | ||||
-rw-r--r-- | main/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala (renamed from core/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala) | 0 | ||||
-rw-r--r-- | main/moduledefs/src/mill/moduledefs/Cacher.scala (renamed from core/moduledefs/src/mill/moduledefs/Cacher.scala) | 0 | ||||
-rw-r--r-- | scalajslib/worker/0.6/src/mill/scalajslib/bridge/ScalaJSBridge.scala (renamed from scalajslib/jsbridges/0.6/src/mill/scalajslib/bridge/ScalaJSBridge.scala) | 0 | ||||
-rw-r--r-- | scalajslib/worker/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala (renamed from scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala) | 0 | ||||
-rw-r--r-- | scalanativelib/worker/0.3/src/mill/scalanativelib/bridge/ScalaNativeBridge.scala (renamed from scalanativelib/scalanativebridges/0.3/src/mill/scalanativelib/bridge/ScalaNativeBridge.scala) | 0 |
32 files changed, 39 insertions, 38 deletions
@@ -51,37 +51,10 @@ trait MillModule extends MillPublishModule with ScalaModule{ outer => else Seq(outer, main.test) def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.6.4") def testFrameworks = Seq("mill.UTestFramework") - def scalacPluginClasspath = super.scalacPluginClasspath() ++ Seq(core.moduledefs.jar()) + def scalacPluginClasspath = super.scalacPluginClasspath() ++ Seq(main.moduledefs.jar()) } } -object core extends MillModule { - def moduleDeps = Seq(moduledefs) - - def compileIvyDeps = Agg( - ivy"org.scala-lang:scala-reflect:${scalaVersion()}" - ) - - def ivyDeps = Agg( - ivy"com.lihaoyi:::ammonite:1.1.2-6-27842d9", - // Necessary so we can share the JNA classes throughout the build process - ivy"net.java.dev.jna:jna:4.5.0", - ivy"net.java.dev.jna:jna-platform:4.5.0" - ) - - def generatedSources = T { - Seq(PathRef(shared.generateCoreSources(T.ctx().dest))) - } - - object moduledefs extends MillPublishModule with ScalaModule{ - def scalaVersion = T{ "2.12.6" } - def ivyDeps = Agg( - ivy"org.scala-lang:scala-compiler:${scalaVersion()}", - ivy"com.lihaoyi::sourcecode:0.1.4" - ) - } - -} object main extends MillModule { def moduleDeps = Seq(core, client) @@ -104,6 +77,34 @@ object main extends MillModule { } } + object core extends MillModule { + def moduleDeps = Seq(moduledefs) + + def compileIvyDeps = Agg( + ivy"org.scala-lang:scala-reflect:${scalaVersion()}" + ) + + def ivyDeps = Agg( + ivy"com.lihaoyi:::ammonite:1.1.2-6-27842d9", + // Necessary so we can share the JNA classes throughout the build process + ivy"net.java.dev.jna:jna:4.5.0", + ivy"net.java.dev.jna:jna-platform:4.5.0" + ) + + def generatedSources = T { + Seq(PathRef(shared.generateCoreSources(T.ctx().dest))) + } + } + + object moduledefs extends MillPublishModule with ScalaModule{ + def scalaVersion = T{ "2.12.6" } + def ivyDeps = Agg( + ivy"org.scala-lang:scala-compiler:${scalaVersion()}", + ivy"com.lihaoyi::sourcecode:0.1.4" + ) + } + + object client extends MillPublishModule{ def ivyDeps = Agg( ivy"org.scala-sbt.ipcsocket:ipcsocket:1.0.0".exclude( @@ -145,8 +146,8 @@ object scalalib extends MillModule { def testArgs = T{ val genIdeaArgs = - genTask(core.moduledefs)() ++ - genTask(core)() ++ + genTask(main.moduledefs)() ++ + genTask(main.core)() ++ genTask(main)() ++ genTask(scalalib)() ++ genTask(scalajslib)() ++ @@ -190,8 +191,8 @@ object scalajslib extends MillModule { def testArgs = T{ val mapping = Map( - "MILL_SCALAJS_BRIDGE_0_6" -> jsbridges("0.6").compile().classes.path, - "MILL_SCALAJS_BRIDGE_1_0" -> jsbridges("1.0").compile().classes.path + "MILL_SCALAJS_BRIDGE_0_6" -> worker("0.6").compile().classes.path, + "MILL_SCALAJS_BRIDGE_1_0" -> worker("1.0").compile().classes.path ) Seq("-Djna.nosys=true") ++ scalalib.worker.testArgs() ++ @@ -199,8 +200,8 @@ object scalajslib extends MillModule { (for((k, v) <- mapping.toSeq) yield s"-D$k=$v") } - object jsbridges extends Cross[JsBridgeModule]("0.6", "1.0") - class JsBridgeModule(scalajsBinary: String) extends MillModule{ + object worker extends Cross[WorkerModule]("0.6", "1.0") + class WorkerModule(scalajsBinary: String) extends MillModule{ def moduleDeps = Seq(scalajslib) def ivyDeps = scalajsBinary match { case "0.6" => @@ -258,7 +259,7 @@ object scalanativelib extends MillModule { def testArgs = T{ val mapping = Map( "MILL_SCALANATIVE_BRIDGE_0_3" -> - scalanativebridges("0.3").runClasspath() + worker("0.3").runClasspath() .map(_.path) .filter(_.toIO.exists) .mkString(",") @@ -268,8 +269,8 @@ object scalanativelib extends MillModule { (for((k, v) <- mapping.toSeq) yield s"-D$k=$v") } - object scalanativebridges extends Cross[ScalaNativeBridgeModule]("0.3") - class ScalaNativeBridgeModule(scalaNativeBinary: String) extends MillModule { + object worker extends Cross[WorkerModule]("0.3") + class WorkerModule(scalaNativeBinary: String) extends MillModule { def scalaNativeVersion = T{ "0.3.8" } def moduleDeps = Seq(scalanativelib) def ivyDeps = scalaNativeBinary match { @@ -305,7 +306,7 @@ def testRepos = T{ } object integration extends MillModule{ - def moduleDeps = Seq(core.moduledefs, scalalib, scalajslib, scalanativelib) + def moduleDeps = Seq(main.moduledefs, scalalib, scalajslib, scalanativelib) def testArgs = T{ scalajslib.testArgs() ++ scalalib.worker.testArgs() ++ diff --git a/core/src/mill/define/Applicative.scala b/main/core/src/mill/define/Applicative.scala index 69c506f7..69c506f7 100644 --- a/core/src/mill/define/Applicative.scala +++ b/main/core/src/mill/define/Applicative.scala diff --git a/core/src/mill/define/BaseModule.scala b/main/core/src/mill/define/BaseModule.scala index 70826be7..70826be7 100644 --- a/core/src/mill/define/BaseModule.scala +++ b/main/core/src/mill/define/BaseModule.scala diff --git a/core/src/mill/define/Cross.scala b/main/core/src/mill/define/Cross.scala index aa730e0d..aa730e0d 100644 --- a/core/src/mill/define/Cross.scala +++ b/main/core/src/mill/define/Cross.scala diff --git a/core/src/mill/define/Ctx.scala b/main/core/src/mill/define/Ctx.scala index fb15dc19..fb15dc19 100644 --- a/core/src/mill/define/Ctx.scala +++ b/main/core/src/mill/define/Ctx.scala diff --git a/core/src/mill/define/Discover.scala b/main/core/src/mill/define/Discover.scala index f0c668e6..f0c668e6 100644 --- a/core/src/mill/define/Discover.scala +++ b/main/core/src/mill/define/Discover.scala diff --git a/core/src/mill/define/Graph.scala b/main/core/src/mill/define/Graph.scala index f06dca11..f06dca11 100644 --- a/core/src/mill/define/Graph.scala +++ b/main/core/src/mill/define/Graph.scala diff --git a/core/src/mill/define/Module.scala b/main/core/src/mill/define/Module.scala index f72ec8ca..f72ec8ca 100644 --- a/core/src/mill/define/Module.scala +++ b/main/core/src/mill/define/Module.scala diff --git a/core/src/mill/define/Task.scala b/main/core/src/mill/define/Task.scala index d5f8680e..d5f8680e 100644 --- a/core/src/mill/define/Task.scala +++ b/main/core/src/mill/define/Task.scala diff --git a/core/src/mill/eval/Evaluator.scala b/main/core/src/mill/eval/Evaluator.scala index 34e1cf6f..34e1cf6f 100644 --- a/core/src/mill/eval/Evaluator.scala +++ b/main/core/src/mill/eval/Evaluator.scala diff --git a/core/src/mill/eval/PathRef.scala b/main/core/src/mill/eval/PathRef.scala index 118d98fe..118d98fe 100644 --- a/core/src/mill/eval/PathRef.scala +++ b/main/core/src/mill/eval/PathRef.scala diff --git a/core/src/mill/eval/Result.scala b/main/core/src/mill/eval/Result.scala index d0400599..d0400599 100644 --- a/core/src/mill/eval/Result.scala +++ b/main/core/src/mill/eval/Result.scala diff --git a/core/src/mill/eval/Tarjans.scala b/main/core/src/mill/eval/Tarjans.scala index ade335a9..ade335a9 100644 --- a/core/src/mill/eval/Tarjans.scala +++ b/main/core/src/mill/eval/Tarjans.scala diff --git a/core/src/mill/util/AggWrapper.scala b/main/core/src/mill/util/AggWrapper.scala index 6c107875..6c107875 100644 --- a/core/src/mill/util/AggWrapper.scala +++ b/main/core/src/mill/util/AggWrapper.scala diff --git a/core/src/mill/util/ClassLoader.scala b/main/core/src/mill/util/ClassLoader.scala index c0421a7b..c0421a7b 100644 --- a/core/src/mill/util/ClassLoader.scala +++ b/main/core/src/mill/util/ClassLoader.scala diff --git a/core/src/mill/util/Ctx.scala b/main/core/src/mill/util/Ctx.scala index 6c8b2afb..6c8b2afb 100644 --- a/core/src/mill/util/Ctx.scala +++ b/main/core/src/mill/util/Ctx.scala diff --git a/core/src/mill/util/EitherOps.scala b/main/core/src/mill/util/EitherOps.scala index da2552c8..da2552c8 100644 --- a/core/src/mill/util/EitherOps.scala +++ b/main/core/src/mill/util/EitherOps.scala diff --git a/core/src/mill/util/EnclosingClass.scala b/main/core/src/mill/util/EnclosingClass.scala index a69cc525..a69cc525 100644 --- a/core/src/mill/util/EnclosingClass.scala +++ b/main/core/src/mill/util/EnclosingClass.scala diff --git a/core/src/mill/util/IO.scala b/main/core/src/mill/util/IO.scala index 833e52c7..833e52c7 100644 --- a/core/src/mill/util/IO.scala +++ b/main/core/src/mill/util/IO.scala diff --git a/core/src/mill/util/JsonFormatters.scala b/main/core/src/mill/util/JsonFormatters.scala index f92941f7..f92941f7 100644 --- a/core/src/mill/util/JsonFormatters.scala +++ b/main/core/src/mill/util/JsonFormatters.scala diff --git a/core/src/mill/util/Logger.scala b/main/core/src/mill/util/Logger.scala index 37ae8577..37ae8577 100644 --- a/core/src/mill/util/Logger.scala +++ b/main/core/src/mill/util/Logger.scala diff --git a/core/src/mill/util/MultiBiMap.scala b/main/core/src/mill/util/MultiBiMap.scala index 2cb81944..2cb81944 100644 --- a/core/src/mill/util/MultiBiMap.scala +++ b/main/core/src/mill/util/MultiBiMap.scala diff --git a/core/src/mill/util/ParseArgs.scala b/main/core/src/mill/util/ParseArgs.scala index ae3b1685..ae3b1685 100644 --- a/core/src/mill/util/ParseArgs.scala +++ b/main/core/src/mill/util/ParseArgs.scala diff --git a/core/src/mill/util/Router.scala b/main/core/src/mill/util/Router.scala index 5dd3c947..5dd3c947 100644 --- a/core/src/mill/util/Router.scala +++ b/main/core/src/mill/util/Router.scala diff --git a/core/src/mill/util/Scripts.scala b/main/core/src/mill/util/Scripts.scala index 7dde8252..7dde8252 100644 --- a/core/src/mill/util/Scripts.scala +++ b/main/core/src/mill/util/Scripts.scala diff --git a/core/src/mill/util/Watched.scala b/main/core/src/mill/util/Watched.scala index f1ef4fee..f1ef4fee 100644 --- a/core/src/mill/util/Watched.scala +++ b/main/core/src/mill/util/Watched.scala diff --git a/core/moduledefs/resources/scalac-plugin.xml b/main/moduledefs/resources/scalac-plugin.xml index 48753a22..48753a22 100644 --- a/core/moduledefs/resources/scalac-plugin.xml +++ b/main/moduledefs/resources/scalac-plugin.xml diff --git a/core/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala b/main/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala index 5b33abbe..5b33abbe 100644 --- a/core/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala +++ b/main/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala diff --git a/core/moduledefs/src/mill/moduledefs/Cacher.scala b/main/moduledefs/src/mill/moduledefs/Cacher.scala index 023f03be..023f03be 100644 --- a/core/moduledefs/src/mill/moduledefs/Cacher.scala +++ b/main/moduledefs/src/mill/moduledefs/Cacher.scala diff --git a/scalajslib/jsbridges/0.6/src/mill/scalajslib/bridge/ScalaJSBridge.scala b/scalajslib/worker/0.6/src/mill/scalajslib/bridge/ScalaJSBridge.scala index 6f14db19..6f14db19 100644 --- a/scalajslib/jsbridges/0.6/src/mill/scalajslib/bridge/ScalaJSBridge.scala +++ b/scalajslib/worker/0.6/src/mill/scalajslib/bridge/ScalaJSBridge.scala diff --git a/scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala b/scalajslib/worker/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala index 534d45bf..534d45bf 100644 --- a/scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala +++ b/scalajslib/worker/1.0/src/mill/scalajslib/bridge/ScalaJSBridge.scala diff --git a/scalanativelib/scalanativebridges/0.3/src/mill/scalanativelib/bridge/ScalaNativeBridge.scala b/scalanativelib/worker/0.3/src/mill/scalanativelib/bridge/ScalaNativeBridge.scala index 268e18ac..268e18ac 100644 --- a/scalanativelib/scalanativebridges/0.3/src/mill/scalanativelib/bridge/ScalaNativeBridge.scala +++ b/scalanativelib/worker/0.3/src/mill/scalanativelib/bridge/ScalaNativeBridge.scala |