diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-07 00:31:34 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-07 00:31:34 -0800 |
| commit | 259b57dd34fc6762835dde236ba4e459dec32103 (patch) | |
| tree | db6e6b7bb5d602e19171c039f600a3cf2fd02d7e /scalalib | |
| parent | 7cd18fd936b95410274be031a8231e5a3d9866a4 (diff) | |
| download | mill-259b57dd34fc6762835dde236ba4e459dec32103.tar.gz mill-259b57dd34fc6762835dde236ba4e459dec32103.tar.bz2 mill-259b57dd34fc6762835dde236ba4e459dec32103.zip | |
Rename `resource/` folders `resources/` to properly match SBT convention, making changes within them get picked up by the file-watching `~compile`/`~test` commands
Diffstat (limited to 'scalalib')
| -rw-r--r-- | scalalib/src/test/resources/hello-world/src/main/scala/Main.scala (renamed from scalalib/src/test/resource/hello-world/src/main/scala/Main.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resources/hello-world/src/main/scala/Result.scala (renamed from scalalib/src/test/resource/hello-world/src/main/scala/Result.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/scalalib/src/test/resource/hello-world/src/main/scala/Main.scala b/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala index 14139d6f..14139d6f 100644 --- a/scalalib/src/test/resource/hello-world/src/main/scala/Main.scala +++ b/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala diff --git a/scalalib/src/test/resource/hello-world/src/main/scala/Result.scala b/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala index d7d29a51..d7d29a51 100644 --- a/scalalib/src/test/resource/hello-world/src/main/scala/Result.scala +++ b/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala diff --git a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala b/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala index c9419d07..fe313f8a 100644 --- a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala +++ b/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala @@ -65,7 +65,7 @@ object HelloWorldScalaOverride extends TestUtil.BaseModule with HelloWorldModule } object HelloWorldTests extends TestSuite { - val srcPath = pwd / 'scalalib / 'src / 'test / 'resource / "hello-world" + val srcPath = pwd / 'scalalib / 'src / 'test / 'resources / "hello-world" val basePath = pwd / 'target / 'workspace / "hello-world" val workingSrcPath = basePath / 'src val outPath = basePath / 'out |