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 /scalajslib | |
| 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 'scalajslib')
| -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 |
7 files changed, 2 insertions, 2 deletions
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, |