From 259b57dd34fc6762835dde236ba4e459dec32103 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 7 Jan 2018 00:31:34 -0800 Subject: Rename `resource/` folders `resources/` to properly match SBT convention, making changes within them get picked up by the file-watching `~compile`/`~test` commands --- scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala | 3 --- scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala | 3 +++ scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala create mode 100644 scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala (limited to 'scalajslib/src') diff --git a/scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala b/scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala deleted file mode 100644 index 60cef56d..00000000 --- a/scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Main extends App { - println("Hello " + sys.props("java.vm.name")) -} diff --git a/scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala b/scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala new file mode 100644 index 00000000..60cef56d --- /dev/null +++ b/scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala @@ -0,0 +1,3 @@ +object Main extends App { + println("Hello " + sys.props("java.vm.name")) +} diff --git a/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala index 4a8fd3cf..8a79df98 100644 --- a/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala +++ b/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala @@ -47,7 +47,7 @@ object HelloJSWorld extends TestUtil.BaseModule { object HelloJSWorldTests extends TestSuite { - val srcPath = pwd / 'scalajslib / 'src / 'test / 'resource / "hello-js-world" + val srcPath = pwd / 'scalajslib / 'src / '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" -- cgit v1.2.3