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 /scalalib | |
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
Diffstat (limited to 'scalalib')
-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 |
34 files changed, 2 insertions, 2 deletions
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 |