diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-20 03:49:17 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-20 03:49:17 -0800 |
commit | d14f56a3fd881f809e58783c49866d1491a5f3fe (patch) | |
tree | 4a9f93d3d7f69211aa444ce15837fe6e79b9db7f | |
parent | aebd7a144fab5bdb95f6ee4f4bc170be65cd0549 (diff) | |
download | mill-d14f56a3fd881f809e58783c49866d1491a5f3fe.tar.gz mill-d14f56a3fd881f809e58783c49866d1491a5f3fe.tar.bz2 mill-d14f56a3fd881f809e58783c49866d1491a5f3fe.zip |
Swap over to simplified Mill module/source layout from SBT's
Removes a lot of useless folders and gives us a chance to exercise this simplified layout. Support for the SBT layout is still verified by our integration tests
-rw-r--r-- | build.sbt | 6 | ||||
-rwxr-xr-x | build.sc | 4 | ||||
-rw-r--r-- | core/src/mill/Main.scala (renamed from core/src/main/scala/mill/Main.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/define/Applicative.scala (renamed from core/src/main/scala/mill/define/Applicative.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/define/Cross.scala (renamed from core/src/main/scala/mill/define/Cross.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/define/Ctx.scala (renamed from core/src/main/scala/mill/define/Ctx.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/define/Discover.scala (renamed from core/src/main/scala/mill/define/Discover.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/define/Graph.scala (renamed from core/src/main/scala/mill/define/Graph.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/define/Module.scala (renamed from core/src/main/scala/mill/define/Module.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/define/Task.scala (renamed from core/src/main/scala/mill/define/Task.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/define/Worker.scala (renamed from core/src/main/scala/mill/define/Worker.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/eval/Evaluator.scala (renamed from core/src/main/scala/mill/eval/Evaluator.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/eval/PathRef.scala (renamed from core/src/main/scala/mill/eval/PathRef.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/eval/Result.scala (renamed from core/src/main/scala/mill/eval/Result.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/eval/Tarjans.scala (renamed from core/src/main/scala/mill/eval/Tarjans.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/main/MainRunner.scala (renamed from core/src/main/scala/mill/main/MainRunner.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/main/ParseArgs.scala (renamed from core/src/main/scala/mill/main/ParseArgs.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/main/ReplApplyHandler.scala (renamed from core/src/main/scala/mill/main/ReplApplyHandler.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/main/Resolve.scala (renamed from core/src/main/scala/mill/main/Resolve.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/main/RunScript.scala (renamed from core/src/main/scala/mill/main/RunScript.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/modules/Jvm.scala (renamed from core/src/main/scala/mill/modules/Jvm.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/modules/Util.scala (renamed from core/src/main/scala/mill/modules/Util.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/package.scala (renamed from core/src/main/scala/mill/package.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/util/AggWrapper.scala (renamed from core/src/main/scala/mill/util/AggWrapper.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/util/Ctx.scala (renamed from core/src/main/scala/mill/util/Ctx.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/util/EitherOps.scala (renamed from core/src/main/scala/mill/util/EitherOps.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/util/JsonFormatters.scala (renamed from core/src/main/scala/mill/util/JsonFormatters.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/util/Logger.scala (renamed from core/src/main/scala/mill/util/Logger.scala) | 0 | ||||
-rw-r--r-- | core/src/mill/util/MultiBiMap.scala (renamed from core/src/main/scala/mill/util/MultiBiMap.scala) | 0 | ||||
-rw-r--r-- | core/src/test/examples/javac/build.sc | 69 | ||||
-rw-r--r-- | core/test/resources/examples/javac/resources/hello.txt (renamed from core/src/test/examples/javac/resources/hello.txt) | 0 | ||||
-rw-r--r-- | core/test/resources/examples/javac/src/Bar.java (renamed from core/src/test/examples/javac/src/Bar.java) | 0 | ||||
-rw-r--r-- | core/test/resources/examples/javac/src/Foo.java (renamed from core/src/test/examples/javac/src/Foo.java) | 0 | ||||
-rw-r--r-- | core/test/src/mill/TestMain.scala (renamed from core/src/test/scala/mill/TestMain.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/UTestFramework.scala (renamed from core/src/test/scala/mill/UTestFramework.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/define/ApplicativeTests.scala (renamed from core/src/test/scala/mill/define/ApplicativeTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/define/BasePathTests.scala (renamed from core/src/test/scala/mill/define/BasePathTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/define/CacherTests.scala (renamed from core/src/test/scala/mill/define/CacherTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/define/DiscoverTests.scala (renamed from core/src/test/scala/mill/define/DiscoverTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/define/GraphTests.scala (renamed from core/src/test/scala/mill/define/GraphTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/define/MacroErrorTests.scala (renamed from core/src/test/scala/mill/define/MacroErrorTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/eval/EvaluationTests.scala (renamed from core/src/test/scala/mill/eval/EvaluationTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/eval/FailureTests.scala (renamed from core/src/test/scala/mill/eval/FailureTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/eval/JavaCompileJarTests.scala (renamed from core/src/test/scala/mill/eval/JavaCompileJarTests.scala) | 2 | ||||
-rw-r--r-- | core/test/src/mill/eval/TarjanTests.scala (renamed from core/src/test/scala/mill/eval/TarjanTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/main/MainTests.scala (renamed from core/src/test/scala/mill/main/MainTests.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/main/ParseArgsTest.scala (renamed from core/src/test/scala/mill/main/ParseArgsTest.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/util/TestEvaluator.scala (renamed from core/src/test/scala/mill/util/TestEvaluator.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/util/TestGraphs.scala (renamed from core/src/test/scala/mill/util/TestGraphs.scala) | 0 | ||||
-rw-r--r-- | core/test/src/mill/util/TestUtil.scala (renamed from core/src/test/scala/mill/util/TestUtil.scala) | 0 | ||||
-rw-r--r-- | integration/test/resources/acyclic/build.sc (renamed from integration/src/test/resources/acyclic/build.sc) | 0 | ||||
-rw-r--r-- | integration/test/resources/ammonite/build.sc (renamed from integration/src/test/resources/ammonite/build.sc) | 0 | ||||
-rw-r--r-- | integration/test/resources/better-files/build.sc (renamed from integration/src/test/resources/better-files/build.sc) | 0 | ||||
-rw-r--r-- | integration/test/resources/jawn/build.sc (renamed from integration/src/test/resources/jawn/build.sc) | 0 | ||||
-rw-r--r-- | integration/test/src/mill/integration/AcyclicTests.scala (renamed from integration/src/test/scala/mill/integration/AcyclicTests.scala) | 0 | ||||
-rw-r--r-- | integration/test/src/mill/integration/AmmoniteTests.scala (renamed from integration/src/test/scala/mill/integration/AmmoniteTests.scala) | 0 | ||||
-rw-r--r-- | integration/test/src/mill/integration/BetterFilesTests.scala (renamed from integration/src/test/scala/mill/integration/BetterFilesTests.scala) | 0 | ||||
-rw-r--r-- | integration/test/src/mill/integration/IntegrationTestSuite.scala (renamed from integration/src/test/scala/mill/integration/IntegrationTestSuite.scala) | 2 | ||||
-rw-r--r-- | integration/test/src/mill/integration/JawnTests.scala (renamed from integration/src/test/scala/mill/integration/JawnTests.scala) | 0 | ||||
-rw-r--r-- | moduledefs/resources/scalac-plugin.xml (renamed from moduledefs/src/main/resources/scalac-plugin.xml) | 0 | ||||
-rw-r--r-- | moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala (renamed from moduledefs/src/main/scala/mill/moduledefs/AutoOverridePlugin.scala) | 0 | ||||
-rw-r--r-- | moduledefs/src/mill/moduledefs/Cacher.scala (renamed from moduledefs/src/main/scala/mill/moduledefs/Cacher.scala) | 0 | ||||
-rw-r--r-- | scalajslib/jsbridges/0.6/src/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala (renamed from scalajslib/jsbridges/0.6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala) | 0 | ||||
-rw-r--r-- | scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala (renamed from scalajslib/jsbridges/1.0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala) | 0 | ||||
-rw-r--r-- | scalajslib/src/mill/scalajslib/Lib.scala (renamed from scalajslib/src/main/scala/mill/scalajslib/Lib.scala) | 0 | ||||
-rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSLinkerBridge.scala (renamed from scalajslib/src/main/scala/mill/scalajslib/ScalaJSLinkerBridge.scala) | 0 | ||||
-rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala (renamed from scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala) | 0 | ||||
-rw-r--r-- | scalajslib/test/resources/hello-js-world/src/Main.scala (renamed from scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala) | 0 | ||||
-rw-r--r-- | scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala (renamed from scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala) | 4 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/Dep.scala (renamed from scalalib/src/main/scala/mill/scalalib/Dep.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/GenIdea.scala (renamed from scalalib/src/main/scala/mill/scalalib/GenIdea.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/Lib.scala (renamed from scalalib/src/main/scala/mill/scalalib/Lib.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/Main.scala (renamed from scalalib/src/main/scala/mill/scalalib/Main.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/MiscModule.scala (renamed from scalalib/src/main/scala/mill/scalalib/MiscModule.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/PublishModule.scala (renamed from scalalib/src/main/scala/mill/scalalib/PublishModule.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala (renamed from scalalib/src/main/scala/mill/scalalib/ScalaModule.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/TestRunner.scala (renamed from scalalib/src/main/scala/mill/scalalib/TestRunner.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/package.scala (renamed from scalalib/src/main/scala/mill/scalalib/package.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/Ivy.scala (renamed from scalalib/src/main/scala/mill/scalalib/publish/Ivy.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/JsonFormatters.scala (renamed from scalalib/src/main/scala/mill/scalalib/publish/JsonFormatters.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/LocalPublisher.scala (renamed from scalalib/src/main/scala/mill/scalalib/publish/LocalPublisher.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/Pom.scala (renamed from scalalib/src/main/scala/mill/scalalib/publish/Pom.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala (renamed from scalalib/src/main/scala/mill/scalalib/publish/SonatypeHttpApi.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/SonatypePublisher.scala (renamed from scalalib/src/main/scala/mill/scalalib/publish/SonatypePublisher.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/package.scala (renamed from scalalib/src/main/scala/mill/scalalib/publish/package.scala) | 0 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/publish/settings.scala (renamed from scalalib/src/main/scala/mill/scalalib/publish/settings.scala) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml (renamed from scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml (renamed from scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml (renamed from scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml (renamed from scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml (renamed from scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml (renamed from scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml (renamed from scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml (renamed from scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/misc.xml (renamed from scalalib/src/test/resources/gen-idea/idea/misc.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea/modules.xml (renamed from scalalib/src/test/resources/gen-idea/idea/modules.xml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea_modules/iml (renamed from scalalib/src/test/resources/gen-idea/idea_modules/iml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/gen-idea/idea_modules/root.iml (renamed from scalalib/src/test/resources/gen-idea/idea_modules/root.iml) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/hello-world/src/Main.scala (renamed from scalalib/src/test/resources/hello-world/src/main/scala/Main.scala) | 0 | ||||
-rw-r--r-- | scalalib/test/resources/hello-world/src/Result.scala (renamed from scalalib/src/test/resources/hello-world/src/main/scala/Result.scala) | 0 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/GenIdeaTests.scala (renamed from scalalib/src/test/scala/mill/scalalib/GenIdeaTests.scala) | 0 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/HelloWorldTests.scala (renamed from scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala) | 4 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/ResolveDepsTests.scala (renamed from scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala) | 0 |
103 files changed, 14 insertions, 77 deletions
@@ -9,6 +9,11 @@ val sharedSettings = Seq( testFrameworks += new TestFramework("mill.UTestFramework"), + scalaSource in Compile := baseDirectory.value / "src", + resourceDirectory in Compile := baseDirectory.value / "resources", + + scalaSource in Test := baseDirectory.value / "test" / "src", + resourceDirectory in Test := baseDirectory.value / "test" / "resources", parallelExecution in Test := false, test in assembly := {}, @@ -164,6 +169,7 @@ def jsbridge(binary: String, version: String) = base = file("scalajslib/jsbridges/" + binary) ) .settings( + sharedSettings, organization := "com.lihaoyi", scalaVersion := "2.12.4", name := "mill-js-bridge", @@ -7,7 +7,7 @@ import mill._ import mill.scalalib._, publish._ import mill.modules.Jvm.createAssembly -object moduledefs extends SbtModule{ +object moduledefs extends ScalaModule{ def scalaVersion = "2.12.4" def ivyDeps = Agg( ivy"org.scala-lang:scala-compiler:${scalaVersion()}", @@ -15,7 +15,7 @@ object moduledefs extends SbtModule{ ) } -trait MillModule extends SbtModule{ outer => +trait MillModule extends ScalaModule{ outer => def scalaVersion = "2.12.4" def compileIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7") diff --git a/core/src/main/scala/mill/Main.scala b/core/src/mill/Main.scala index 3025994c..3025994c 100644 --- a/core/src/main/scala/mill/Main.scala +++ b/core/src/mill/Main.scala diff --git a/core/src/main/scala/mill/define/Applicative.scala b/core/src/mill/define/Applicative.scala index 69c506f7..69c506f7 100644 --- a/core/src/main/scala/mill/define/Applicative.scala +++ b/core/src/mill/define/Applicative.scala diff --git a/core/src/main/scala/mill/define/Cross.scala b/core/src/mill/define/Cross.scala index b51064be..b51064be 100644 --- a/core/src/main/scala/mill/define/Cross.scala +++ b/core/src/mill/define/Cross.scala diff --git a/core/src/main/scala/mill/define/Ctx.scala b/core/src/mill/define/Ctx.scala index 6d685521..6d685521 100644 --- a/core/src/main/scala/mill/define/Ctx.scala +++ b/core/src/mill/define/Ctx.scala diff --git a/core/src/main/scala/mill/define/Discover.scala b/core/src/mill/define/Discover.scala index 52f4ab77..52f4ab77 100644 --- a/core/src/main/scala/mill/define/Discover.scala +++ b/core/src/mill/define/Discover.scala diff --git a/core/src/main/scala/mill/define/Graph.scala b/core/src/mill/define/Graph.scala index f06dca11..f06dca11 100644 --- a/core/src/main/scala/mill/define/Graph.scala +++ b/core/src/mill/define/Graph.scala diff --git a/core/src/main/scala/mill/define/Module.scala b/core/src/mill/define/Module.scala index e42ce798..e42ce798 100644 --- a/core/src/main/scala/mill/define/Module.scala +++ b/core/src/mill/define/Module.scala diff --git a/core/src/main/scala/mill/define/Task.scala b/core/src/mill/define/Task.scala index 90908e4e..90908e4e 100644 --- a/core/src/main/scala/mill/define/Task.scala +++ b/core/src/mill/define/Task.scala diff --git a/core/src/main/scala/mill/define/Worker.scala b/core/src/mill/define/Worker.scala index 3d35d2e0..3d35d2e0 100644 --- a/core/src/main/scala/mill/define/Worker.scala +++ b/core/src/mill/define/Worker.scala diff --git a/core/src/main/scala/mill/eval/Evaluator.scala b/core/src/mill/eval/Evaluator.scala index 44f24275..44f24275 100644 --- a/core/src/main/scala/mill/eval/Evaluator.scala +++ b/core/src/mill/eval/Evaluator.scala diff --git a/core/src/main/scala/mill/eval/PathRef.scala b/core/src/mill/eval/PathRef.scala index 0a629a14..0a629a14 100644 --- a/core/src/main/scala/mill/eval/PathRef.scala +++ b/core/src/mill/eval/PathRef.scala diff --git a/core/src/main/scala/mill/eval/Result.scala b/core/src/mill/eval/Result.scala index a9b2c70b..a9b2c70b 100644 --- a/core/src/main/scala/mill/eval/Result.scala +++ b/core/src/mill/eval/Result.scala diff --git a/core/src/main/scala/mill/eval/Tarjans.scala b/core/src/mill/eval/Tarjans.scala index ade335a9..ade335a9 100644 --- a/core/src/main/scala/mill/eval/Tarjans.scala +++ b/core/src/mill/eval/Tarjans.scala diff --git a/core/src/main/scala/mill/main/MainRunner.scala b/core/src/mill/main/MainRunner.scala index 5281b886..5281b886 100644 --- a/core/src/main/scala/mill/main/MainRunner.scala +++ b/core/src/mill/main/MainRunner.scala diff --git a/core/src/main/scala/mill/main/ParseArgs.scala b/core/src/mill/main/ParseArgs.scala index dc848418..dc848418 100644 --- a/core/src/main/scala/mill/main/ParseArgs.scala +++ b/core/src/mill/main/ParseArgs.scala diff --git a/core/src/main/scala/mill/main/ReplApplyHandler.scala b/core/src/mill/main/ReplApplyHandler.scala index 97efb6e5..97efb6e5 100644 --- a/core/src/main/scala/mill/main/ReplApplyHandler.scala +++ b/core/src/mill/main/ReplApplyHandler.scala diff --git a/core/src/main/scala/mill/main/Resolve.scala b/core/src/mill/main/Resolve.scala index ed4c4f80..ed4c4f80 100644 --- a/core/src/main/scala/mill/main/Resolve.scala +++ b/core/src/mill/main/Resolve.scala diff --git a/core/src/main/scala/mill/main/RunScript.scala b/core/src/mill/main/RunScript.scala index aa254048..aa254048 100644 --- a/core/src/main/scala/mill/main/RunScript.scala +++ b/core/src/mill/main/RunScript.scala diff --git a/core/src/main/scala/mill/modules/Jvm.scala b/core/src/mill/modules/Jvm.scala index 888a687b..888a687b 100644 --- a/core/src/main/scala/mill/modules/Jvm.scala +++ b/core/src/mill/modules/Jvm.scala diff --git a/core/src/main/scala/mill/modules/Util.scala b/core/src/mill/modules/Util.scala index cd674bad..cd674bad 100644 --- a/core/src/main/scala/mill/modules/Util.scala +++ b/core/src/mill/modules/Util.scala diff --git a/core/src/main/scala/mill/package.scala b/core/src/mill/package.scala index 93916c8b..93916c8b 100644 --- a/core/src/main/scala/mill/package.scala +++ b/core/src/mill/package.scala diff --git a/core/src/main/scala/mill/util/AggWrapper.scala b/core/src/mill/util/AggWrapper.scala index c2994a9a..c2994a9a 100644 --- a/core/src/main/scala/mill/util/AggWrapper.scala +++ b/core/src/mill/util/AggWrapper.scala diff --git a/core/src/main/scala/mill/util/Ctx.scala b/core/src/mill/util/Ctx.scala index 60e6bdbf..60e6bdbf 100644 --- a/core/src/main/scala/mill/util/Ctx.scala +++ b/core/src/mill/util/Ctx.scala diff --git a/core/src/main/scala/mill/util/EitherOps.scala b/core/src/mill/util/EitherOps.scala index da2552c8..da2552c8 100644 --- a/core/src/main/scala/mill/util/EitherOps.scala +++ b/core/src/mill/util/EitherOps.scala diff --git a/core/src/main/scala/mill/util/JsonFormatters.scala b/core/src/mill/util/JsonFormatters.scala index 00a40e7d..00a40e7d 100644 --- a/core/src/main/scala/mill/util/JsonFormatters.scala +++ b/core/src/mill/util/JsonFormatters.scala diff --git a/core/src/main/scala/mill/util/Logger.scala b/core/src/mill/util/Logger.scala index 17c66d27..17c66d27 100644 --- a/core/src/main/scala/mill/util/Logger.scala +++ b/core/src/mill/util/Logger.scala diff --git a/core/src/main/scala/mill/util/MultiBiMap.scala b/core/src/mill/util/MultiBiMap.scala index 2cb81944..2cb81944 100644 --- a/core/src/main/scala/mill/util/MultiBiMap.scala +++ b/core/src/mill/util/MultiBiMap.scala diff --git a/core/src/test/examples/javac/build.sc b/core/src/test/examples/javac/build.sc deleted file mode 100644 index e4f7ea01..00000000 --- a/core/src/test/examples/javac/build.sc +++ /dev/null @@ -1,69 +0,0 @@ -import mill.define.Task -import mill.eval.PathRef - -object Foo { - - import java.io.FileOutputStream - import java.util.jar.JarEntry - - import ammonite.ops.{ls, pwd, read} - import mill.discover.Discovered - import mill.util.Ctx - - val workspacePath = pwd / 'target / 'workspace / 'javac - val javacSrcPath = pwd / 'src / 'test / 'examples / 'javac - val javacDestPath = workspacePath / 'src - - val sourceRootPath = javacDestPath / 'src - val resourceRootPath = javacDestPath / 'resources - - // sourceRoot -> allSources -> classFiles - // | - // v - // resourceRoot ----> jar - val sourceRoot = Task.path(sourceRootPath) - val resourceRoot = Task.path(resourceRootPath) - val allSources = list(sourceRoot) - val classFiles = compileAll(allSources) - val jar = jarUp(resourceRoot, classFiles) - - def compileAll(sources: Task[Seq[PathRef]]) = { - new Task.Subprocess( - Seq(sources), - args => - Seq("javac") ++ - args[Seq[PathRef]](0).map(_.path.toString) ++ - Seq("-d", args.dest.toString) - ).map(_.dest) - } - - def list(root: Task[PathRef]): Task[Seq[PathRef]] = { - root.map(x => ls.rec(x.path).map(PathRef(_))) - } - - case class jarUp(roots: Task[PathRef]*) extends Task[PathRef] { - - val inputs = roots - - def evaluate(args: Ctx): PathRef = { - - val output = new java.util.jar.JarOutputStream(new FileOutputStream(args.dest.toIO)) - for { - root0 <- args.args - root = root0.asInstanceOf[PathRef] - - path <- ls.rec(root.path) - if path.isFile - } { - val relative = path.relativeTo(root.path) - output.putNextEntry(new JarEntry(relative.toString)) - output.write(read.bytes(path)) - } - output.close() - args.dest - } - } - -} - -@main def main(): Any = Foo -> mill.Discovered[Foo.type] diff --git a/core/src/test/examples/javac/resources/hello.txt b/core/test/resources/examples/javac/resources/hello.txt index 5e1c309d..5e1c309d 100644 --- a/core/src/test/examples/javac/resources/hello.txt +++ b/core/test/resources/examples/javac/resources/hello.txt diff --git a/core/src/test/examples/javac/src/Bar.java b/core/test/resources/examples/javac/src/Bar.java index 4e30c89b..4e30c89b 100644 --- a/core/src/test/examples/javac/src/Bar.java +++ b/core/test/resources/examples/javac/src/Bar.java diff --git a/core/src/test/examples/javac/src/Foo.java b/core/test/resources/examples/javac/src/Foo.java index e694f9fa..e694f9fa 100644 --- a/core/src/test/examples/javac/src/Foo.java +++ b/core/test/resources/examples/javac/src/Foo.java diff --git a/core/src/test/scala/mill/TestMain.scala b/core/test/src/mill/TestMain.scala index 80e7e627..80e7e627 100644 --- a/core/src/test/scala/mill/TestMain.scala +++ b/core/test/src/mill/TestMain.scala diff --git a/core/src/test/scala/mill/UTestFramework.scala b/core/test/src/mill/UTestFramework.scala index 6c0d5191..6c0d5191 100644 --- a/core/src/test/scala/mill/UTestFramework.scala +++ b/core/test/src/mill/UTestFramework.scala diff --git a/core/src/test/scala/mill/define/ApplicativeTests.scala b/core/test/src/mill/define/ApplicativeTests.scala index 72b715bb..72b715bb 100644 --- a/core/src/test/scala/mill/define/ApplicativeTests.scala +++ b/core/test/src/mill/define/ApplicativeTests.scala diff --git a/core/src/test/scala/mill/define/BasePathTests.scala b/core/test/src/mill/define/BasePathTests.scala index a0be4762..a0be4762 100644 --- a/core/src/test/scala/mill/define/BasePathTests.scala +++ b/core/test/src/mill/define/BasePathTests.scala diff --git a/core/src/test/scala/mill/define/CacherTests.scala b/core/test/src/mill/define/CacherTests.scala index eb981d46..eb981d46 100644 --- a/core/src/test/scala/mill/define/CacherTests.scala +++ b/core/test/src/mill/define/CacherTests.scala diff --git a/core/src/test/scala/mill/define/DiscoverTests.scala b/core/test/src/mill/define/DiscoverTests.scala index 7621169a..7621169a 100644 --- a/core/src/test/scala/mill/define/DiscoverTests.scala +++ b/core/test/src/mill/define/DiscoverTests.scala diff --git a/core/src/test/scala/mill/define/GraphTests.scala b/core/test/src/mill/define/GraphTests.scala index 7e6680be..7e6680be 100644 --- a/core/src/test/scala/mill/define/GraphTests.scala +++ b/core/test/src/mill/define/GraphTests.scala diff --git a/core/src/test/scala/mill/define/MacroErrorTests.scala b/core/test/src/mill/define/MacroErrorTests.scala index a389feaa..a389feaa 100644 --- a/core/src/test/scala/mill/define/MacroErrorTests.scala +++ b/core/test/src/mill/define/MacroErrorTests.scala diff --git a/core/src/test/scala/mill/eval/EvaluationTests.scala b/core/test/src/mill/eval/EvaluationTests.scala index 0d14988a..0d14988a 100644 --- a/core/src/test/scala/mill/eval/EvaluationTests.scala +++ b/core/test/src/mill/eval/EvaluationTests.scala diff --git a/core/src/test/scala/mill/eval/FailureTests.scala b/core/test/src/mill/eval/FailureTests.scala index 12ed345d..12ed345d 100644 --- a/core/src/test/scala/mill/eval/FailureTests.scala +++ b/core/test/src/mill/eval/FailureTests.scala diff --git a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala b/core/test/src/mill/eval/JavaCompileJarTests.scala index 18948e27..5dd9cae1 100644 --- a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala +++ b/core/test/src/mill/eval/JavaCompileJarTests.scala @@ -22,7 +22,7 @@ object JavaCompileJarTests extends TestSuite{ val tests = Tests{ 'javac { val workspacePath = pwd / 'target / 'workspace / 'javac - val javacSrcPath = pwd / 'core / 'src / 'test / 'examples / 'javac + val javacSrcPath = pwd / 'core / 'test / 'resources / 'examples / 'javac val javacDestPath = workspacePath / 'src mkdir(pwd / 'target / 'workspace / 'javac) diff --git a/core/src/test/scala/mill/eval/TarjanTests.scala b/core/test/src/mill/eval/TarjanTests.scala index 2f9d0a4d..2f9d0a4d 100644 --- a/core/src/test/scala/mill/eval/TarjanTests.scala +++ b/core/test/src/mill/eval/TarjanTests.scala diff --git a/core/src/test/scala/mill/main/MainTests.scala b/core/test/src/mill/main/MainTests.scala index c2499835..c2499835 100644 --- a/core/src/test/scala/mill/main/MainTests.scala +++ b/core/test/src/mill/main/MainTests.scala diff --git a/core/src/test/scala/mill/main/ParseArgsTest.scala b/core/test/src/mill/main/ParseArgsTest.scala index 2ef07d36..2ef07d36 100644 --- a/core/src/test/scala/mill/main/ParseArgsTest.scala +++ b/core/test/src/mill/main/ParseArgsTest.scala diff --git a/core/src/test/scala/mill/util/TestEvaluator.scala b/core/test/src/mill/util/TestEvaluator.scala index 47c9d940..47c9d940 100644 --- a/core/src/test/scala/mill/util/TestEvaluator.scala +++ b/core/test/src/mill/util/TestEvaluator.scala diff --git a/core/src/test/scala/mill/util/TestGraphs.scala b/core/test/src/mill/util/TestGraphs.scala index 54c8d815..54c8d815 100644 --- a/core/src/test/scala/mill/util/TestGraphs.scala +++ b/core/test/src/mill/util/TestGraphs.scala diff --git a/core/src/test/scala/mill/util/TestUtil.scala b/core/test/src/mill/util/TestUtil.scala index 1af12a74..1af12a74 100644 --- a/core/src/test/scala/mill/util/TestUtil.scala +++ b/core/test/src/mill/util/TestUtil.scala diff --git a/integration/src/test/resources/acyclic/build.sc b/integration/test/resources/acyclic/build.sc index b8f878ad..b8f878ad 100644 --- a/integration/src/test/resources/acyclic/build.sc +++ b/integration/test/resources/acyclic/build.sc diff --git a/integration/src/test/resources/ammonite/build.sc b/integration/test/resources/ammonite/build.sc index cb8d32ab..cb8d32ab 100644 --- a/integration/src/test/resources/ammonite/build.sc +++ b/integration/test/resources/ammonite/build.sc diff --git a/integration/src/test/resources/better-files/build.sc b/integration/test/resources/better-files/build.sc index 582d3400..582d3400 100644 --- a/integration/src/test/resources/better-files/build.sc +++ b/integration/test/resources/better-files/build.sc diff --git a/integration/src/test/resources/jawn/build.sc b/integration/test/resources/jawn/build.sc index 4898a3cb..4898a3cb 100644 --- a/integration/src/test/resources/jawn/build.sc +++ b/integration/test/resources/jawn/build.sc diff --git a/integration/src/test/scala/mill/integration/AcyclicTests.scala b/integration/test/src/mill/integration/AcyclicTests.scala index 42b5179b..42b5179b 100644 --- a/integration/src/test/scala/mill/integration/AcyclicTests.scala +++ b/integration/test/src/mill/integration/AcyclicTests.scala diff --git a/integration/src/test/scala/mill/integration/AmmoniteTests.scala b/integration/test/src/mill/integration/AmmoniteTests.scala index 22bd3cb8..22bd3cb8 100644 --- a/integration/src/test/scala/mill/integration/AmmoniteTests.scala +++ b/integration/test/src/mill/integration/AmmoniteTests.scala diff --git a/integration/src/test/scala/mill/integration/BetterFilesTests.scala b/integration/test/src/mill/integration/BetterFilesTests.scala index 7ee943df..7ee943df 100644 --- a/integration/src/test/scala/mill/integration/BetterFilesTests.scala +++ b/integration/test/src/mill/integration/BetterFilesTests.scala diff --git a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala b/integration/test/src/mill/integration/IntegrationTestSuite.scala index 293411c5..4649abdb 100644 --- a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala +++ b/integration/test/src/mill/integration/IntegrationTestSuite.scala @@ -9,7 +9,7 @@ import utest._ abstract class IntegrationTestSuite(repoKey: String, workspaceSlug: String) extends TestSuite{ val workspacePath = pwd / 'target / 'workspace / workspaceSlug - val buildFilePath = pwd / 'integration / 'src / 'test / 'resources / workspaceSlug + val buildFilePath = pwd / 'integration / 'test / 'resources / workspaceSlug val stdOutErr = new PrintStream(new ByteArrayOutputStream()) val stdIn = new ByteArrayInputStream(Array()) val runner = new mill.main.MainRunner( diff --git a/integration/src/test/scala/mill/integration/JawnTests.scala b/integration/test/src/mill/integration/JawnTests.scala index 21c9f133..21c9f133 100644 --- a/integration/src/test/scala/mill/integration/JawnTests.scala +++ b/integration/test/src/mill/integration/JawnTests.scala diff --git a/moduledefs/src/main/resources/scalac-plugin.xml b/moduledefs/resources/scalac-plugin.xml index 48753a22..48753a22 100644 --- a/moduledefs/src/main/resources/scalac-plugin.xml +++ b/moduledefs/resources/scalac-plugin.xml diff --git a/moduledefs/src/main/scala/mill/moduledefs/AutoOverridePlugin.scala b/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala index 5b33abbe..5b33abbe 100644 --- a/moduledefs/src/main/scala/mill/moduledefs/AutoOverridePlugin.scala +++ b/moduledefs/src/mill/moduledefs/AutoOverridePlugin.scala diff --git a/moduledefs/src/main/scala/mill/moduledefs/Cacher.scala b/moduledefs/src/mill/moduledefs/Cacher.scala index 023f03be..023f03be 100644 --- a/moduledefs/src/main/scala/mill/moduledefs/Cacher.scala +++ b/moduledefs/src/mill/moduledefs/Cacher.scala diff --git a/scalajslib/jsbridges/0.6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala b/scalajslib/jsbridges/0.6/src/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala index 4826b1cd..4826b1cd 100644 --- a/scalajslib/jsbridges/0.6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala +++ b/scalajslib/jsbridges/0.6/src/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala diff --git a/scalajslib/jsbridges/1.0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala b/scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala index ef896726..ef896726 100644 --- a/scalajslib/jsbridges/1.0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala +++ b/scalajslib/jsbridges/1.0/src/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala diff --git a/scalajslib/src/main/scala/mill/scalajslib/Lib.scala b/scalajslib/src/mill/scalajslib/Lib.scala index 6a85cf0c..6a85cf0c 100644 --- a/scalajslib/src/main/scala/mill/scalajslib/Lib.scala +++ b/scalajslib/src/mill/scalajslib/Lib.scala diff --git a/scalajslib/src/main/scala/mill/scalajslib/ScalaJSLinkerBridge.scala b/scalajslib/src/mill/scalajslib/ScalaJSLinkerBridge.scala index 448cc16a..448cc16a 100644 --- a/scalajslib/src/main/scala/mill/scalajslib/ScalaJSLinkerBridge.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSLinkerBridge.scala diff --git a/scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index 5c964fd6..5c964fd6 100644 --- a/scalajslib/src/main/scala/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala diff --git a/scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala b/scalajslib/test/resources/hello-js-world/src/Main.scala index 60cef56d..60cef56d 100644 --- a/scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala +++ b/scalajslib/test/resources/hello-js-world/src/Main.scala diff --git a/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala index 2094687b..4f655912 100644 --- a/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala +++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala @@ -50,10 +50,10 @@ object HelloJSWorldTests extends TestSuite { } } - val srcPath = pwd / 'scalajslib / 'src / 'test / 'resources / "hello-js-world" + val srcPath = pwd / 'scalajslib / 'test / 'resources / "hello-js-world" val workspacePath = pwd / 'target / 'workspace / "hello-js-world" val outputPath = workspacePath / 'out - val mainObject = workspacePath / 'src / 'main / 'scala / "Main.scala" + val mainObject = workspacePath / 'src / "Main.scala" val helloWorldEvaluator = new TestEvaluator( HelloJSWorld, diff --git a/scalalib/src/main/scala/mill/scalalib/Dep.scala b/scalalib/src/mill/scalalib/Dep.scala index aa301fcb..aa301fcb 100644 --- a/scalalib/src/main/scala/mill/scalalib/Dep.scala +++ b/scalalib/src/mill/scalalib/Dep.scala diff --git a/scalalib/src/main/scala/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala index 4496c8c6..4496c8c6 100644 --- a/scalalib/src/main/scala/mill/scalalib/GenIdea.scala +++ b/scalalib/src/mill/scalalib/GenIdea.scala diff --git a/scalalib/src/main/scala/mill/scalalib/Lib.scala b/scalalib/src/mill/scalalib/Lib.scala index a038a59b..a038a59b 100644 --- a/scalalib/src/main/scala/mill/scalalib/Lib.scala +++ b/scalalib/src/mill/scalalib/Lib.scala diff --git a/scalalib/src/main/scala/mill/scalalib/Main.scala b/scalalib/src/mill/scalalib/Main.scala index 584fe9d1..584fe9d1 100644 --- a/scalalib/src/main/scala/mill/scalalib/Main.scala +++ b/scalalib/src/mill/scalalib/Main.scala diff --git a/scalalib/src/main/scala/mill/scalalib/MiscModule.scala b/scalalib/src/mill/scalalib/MiscModule.scala index 502ba461..502ba461 100644 --- a/scalalib/src/main/scala/mill/scalalib/MiscModule.scala +++ b/scalalib/src/mill/scalalib/MiscModule.scala diff --git a/scalalib/src/main/scala/mill/scalalib/PublishModule.scala b/scalalib/src/mill/scalalib/PublishModule.scala index 64efce77..64efce77 100644 --- a/scalalib/src/main/scala/mill/scalalib/PublishModule.scala +++ b/scalalib/src/mill/scalalib/PublishModule.scala diff --git a/scalalib/src/main/scala/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 1b2bd28d..1b2bd28d 100644 --- a/scalalib/src/main/scala/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala diff --git a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala b/scalalib/src/mill/scalalib/TestRunner.scala index 01726022..01726022 100644 --- a/scalalib/src/main/scala/mill/scalalib/TestRunner.scala +++ b/scalalib/src/mill/scalalib/TestRunner.scala diff --git a/scalalib/src/main/scala/mill/scalalib/package.scala b/scalalib/src/mill/scalalib/package.scala index 5a282e82..5a282e82 100644 --- a/scalalib/src/main/scala/mill/scalalib/package.scala +++ b/scalalib/src/mill/scalalib/package.scala diff --git a/scalalib/src/main/scala/mill/scalalib/publish/Ivy.scala b/scalalib/src/mill/scalalib/publish/Ivy.scala index b0b6443e..b0b6443e 100644 --- a/scalalib/src/main/scala/mill/scalalib/publish/Ivy.scala +++ b/scalalib/src/mill/scalalib/publish/Ivy.scala diff --git a/scalalib/src/main/scala/mill/scalalib/publish/JsonFormatters.scala b/scalalib/src/mill/scalalib/publish/JsonFormatters.scala index cf1af557..cf1af557 100644 --- a/scalalib/src/main/scala/mill/scalalib/publish/JsonFormatters.scala +++ b/scalalib/src/mill/scalalib/publish/JsonFormatters.scala diff --git a/scalalib/src/main/scala/mill/scalalib/publish/LocalPublisher.scala b/scalalib/src/mill/scalalib/publish/LocalPublisher.scala index a9957e5c..a9957e5c 100644 --- a/scalalib/src/main/scala/mill/scalalib/publish/LocalPublisher.scala +++ b/scalalib/src/mill/scalalib/publish/LocalPublisher.scala diff --git a/scalalib/src/main/scala/mill/scalalib/publish/Pom.scala b/scalalib/src/mill/scalalib/publish/Pom.scala index 74dc6e8f..74dc6e8f 100644 --- a/scalalib/src/main/scala/mill/scalalib/publish/Pom.scala +++ b/scalalib/src/mill/scalalib/publish/Pom.scala diff --git a/scalalib/src/main/scala/mill/scalalib/publish/SonatypeHttpApi.scala b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala index 8ccdf3ea..8ccdf3ea 100644 --- a/scalalib/src/main/scala/mill/scalalib/publish/SonatypeHttpApi.scala +++ b/scalalib/src/mill/scalalib/publish/SonatypeHttpApi.scala diff --git a/scalalib/src/main/scala/mill/scalalib/publish/SonatypePublisher.scala b/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala index 0749b0c5..0749b0c5 100644 --- a/scalalib/src/main/scala/mill/scalalib/publish/SonatypePublisher.scala +++ b/scalalib/src/mill/scalalib/publish/SonatypePublisher.scala diff --git a/scalalib/src/main/scala/mill/scalalib/publish/package.scala b/scalalib/src/mill/scalalib/publish/package.scala index 99eeec14..99eeec14 100644 --- a/scalalib/src/main/scala/mill/scalalib/publish/package.scala +++ b/scalalib/src/mill/scalalib/publish/package.scala diff --git a/scalalib/src/main/scala/mill/scalalib/publish/settings.scala b/scalalib/src/mill/scalalib/publish/settings.scala index eb0a44b6..eb0a44b6 100644 --- a/scalalib/src/main/scala/mill/scalalib/publish/settings.scala +++ b/scalalib/src/mill/scalalib/publish/settings.scala diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml index a6398d46..a6398d46 100644 --- a/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml index 5e21f3f3..5e21f3f3 100644 --- a/scalalib/src/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml index fe9d533a..fe9d533a 100644 --- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml index ec0460d7..ec0460d7 100644 --- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml index a1278e29..a1278e29 100644 --- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml index bbd957f0..bbd957f0 100644 --- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml index 09db75bb..09db75bb 100644 --- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml diff --git a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml index f23b80f6..f23b80f6 100644 --- a/scalalib/src/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml diff --git a/scalalib/src/test/resources/gen-idea/idea/misc.xml b/scalalib/test/resources/gen-idea/idea/misc.xml index 2726692f..2726692f 100644 --- a/scalalib/src/test/resources/gen-idea/idea/misc.xml +++ b/scalalib/test/resources/gen-idea/idea/misc.xml diff --git a/scalalib/src/test/resources/gen-idea/idea/modules.xml b/scalalib/test/resources/gen-idea/idea/modules.xml index 374b9a1f..374b9a1f 100644 --- a/scalalib/src/test/resources/gen-idea/idea/modules.xml +++ b/scalalib/test/resources/gen-idea/idea/modules.xml diff --git a/scalalib/src/test/resources/gen-idea/idea_modules/iml b/scalalib/test/resources/gen-idea/idea_modules/iml index 548865f1..548865f1 100644 --- a/scalalib/src/test/resources/gen-idea/idea_modules/iml +++ b/scalalib/test/resources/gen-idea/idea_modules/iml diff --git a/scalalib/src/test/resources/gen-idea/idea_modules/root.iml b/scalalib/test/resources/gen-idea/idea_modules/root.iml index dcf5f7fc..dcf5f7fc 100644 --- a/scalalib/src/test/resources/gen-idea/idea_modules/root.iml +++ b/scalalib/test/resources/gen-idea/idea_modules/root.iml diff --git a/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala b/scalalib/test/resources/hello-world/src/Main.scala index 14139d6f..14139d6f 100644 --- a/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala +++ b/scalalib/test/resources/hello-world/src/Main.scala diff --git a/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala b/scalalib/test/resources/hello-world/src/Result.scala index d7d29a51..d7d29a51 100644 --- a/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala +++ b/scalalib/test/resources/hello-world/src/Result.scala diff --git a/scalalib/src/test/scala/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala index 36945f65..36945f65 100644 --- a/scalalib/src/test/scala/mill/scalalib/GenIdeaTests.scala +++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala diff --git a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala index 7444604b..8ac45bf3 100644 --- a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala +++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala @@ -74,11 +74,11 @@ object HelloWorldTests extends TestSuite { object HelloWorldScalaOverride extends TestUtil.BaseModule with HelloWorldModule { override def scalaVersion: Target[String] = "2.11.11" } - val srcPath = pwd / 'scalalib / 'src / 'test / 'resources / "hello-world" + val srcPath = pwd / 'scalalib / 'test / 'resources / "hello-world" val basePath = pwd / 'target / 'workspace / "hello-world" val workingSrcPath = basePath / 'src val outPath = basePath / 'out - val mainObject = workingSrcPath / 'src / 'main / 'scala / "Main.scala" + val mainObject = workingSrcPath / 'src / "Main.scala" diff --git a/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala index d1ddde20..d1ddde20 100644 --- a/scalalib/src/test/scala/mill/scalalib/ResolveDepsTests.scala +++ b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala |