From 259b57dd34fc6762835dde236ba4e459dec32103 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
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

---
 .../src/test/resource/hello-world/src/main/scala/Main.scala  | 12 ------------
 .../test/resource/hello-world/src/main/scala/Result.scala    |  7 -------
 .../src/test/resources/hello-world/src/main/scala/Main.scala | 12 ++++++++++++
 .../test/resources/hello-world/src/main/scala/Result.scala   |  7 +++++++
 scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala  |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 scalalib/src/test/resource/hello-world/src/main/scala/Main.scala
 delete mode 100644 scalalib/src/test/resource/hello-world/src/main/scala/Result.scala
 create mode 100644 scalalib/src/test/resources/hello-world/src/main/scala/Main.scala
 create mode 100644 scalalib/src/test/resources/hello-world/src/main/scala/Result.scala

(limited to 'scalalib')

diff --git a/scalalib/src/test/resource/hello-world/src/main/scala/Main.scala b/scalalib/src/test/resource/hello-world/src/main/scala/Main.scala
deleted file mode 100644
index 14139d6f..00000000
--- a/scalalib/src/test/resource/hello-world/src/main/scala/Main.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import scala.collection._ // unused import to check unused imports warning
-import java.nio.file.{Files, Paths}
-
-object Main extends App {
-
-  val person = Person.fromString("rockjam:25")
-  val greeting = s"hello ${person.name}, your age is: ${person.age}"
-  println(greeting)
-  val resultPath = Paths.get(args(0))
-  Files.createDirectories(resultPath.getParent)
-  Files.write(resultPath, greeting.getBytes)
-}
diff --git a/scalalib/src/test/resource/hello-world/src/main/scala/Result.scala b/scalalib/src/test/resource/hello-world/src/main/scala/Result.scala
deleted file mode 100644
index d7d29a51..00000000
--- a/scalalib/src/test/resource/hello-world/src/main/scala/Result.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-object Person {
-  def fromString(s: String): Person = {
-    val Array(name, age) = s.split(":")
-    Person(name, age.toInt)
-  }
-}
-case class Person(name: String, age: Int)
diff --git a/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala b/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala
new file mode 100644
index 00000000..14139d6f
--- /dev/null
+++ b/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala
@@ -0,0 +1,12 @@
+import scala.collection._ // unused import to check unused imports warning
+import java.nio.file.{Files, Paths}
+
+object Main extends App {
+
+  val person = Person.fromString("rockjam:25")
+  val greeting = s"hello ${person.name}, your age is: ${person.age}"
+  println(greeting)
+  val resultPath = Paths.get(args(0))
+  Files.createDirectories(resultPath.getParent)
+  Files.write(resultPath, greeting.getBytes)
+}
diff --git a/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala b/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala
new file mode 100644
index 00000000..d7d29a51
--- /dev/null
+++ b/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala
@@ -0,0 +1,7 @@
+object Person {
+  def fromString(s: String): Person = {
+    val Array(name, age) = s.split(":")
+    Person(name, age.toInt)
+  }
+}
+case class Person(name: String, age: Int)
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
-- 
cgit v1.2.3