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 --- integration/src/test/resource/acyclic/build.sc | 39 ---------- .../src/test/resource/better-files/build.sc | 83 ---------------------- integration/src/test/resource/jawn/build.sc | 60 ---------------- integration/src/test/resources/acyclic/build.sc | 39 ++++++++++ .../src/test/resources/better-files/build.sc | 83 ++++++++++++++++++++++ integration/src/test/resources/jawn/build.sc | 60 ++++++++++++++++ .../mill/integration/IntegrationTestSuite.scala | 2 +- .../hello-js-world/src/main/scala/Main.scala | 3 - .../hello-js-world/src/main/scala/Main.scala | 3 + .../scala/mill/scalajslib/HelloJSWorldTests.scala | 2 +- .../resource/hello-world/src/main/scala/Main.scala | 12 ---- .../hello-world/src/main/scala/Result.scala | 7 -- .../hello-world/src/main/scala/Main.scala | 12 ++++ .../hello-world/src/main/scala/Result.scala | 7 ++ .../test/scala/mill/scalalib/HelloWorldTests.scala | 2 +- 15 files changed, 207 insertions(+), 207 deletions(-) delete mode 100644 integration/src/test/resource/acyclic/build.sc delete mode 100644 integration/src/test/resource/better-files/build.sc delete mode 100644 integration/src/test/resource/jawn/build.sc create mode 100644 integration/src/test/resources/acyclic/build.sc create mode 100644 integration/src/test/resources/better-files/build.sc create mode 100644 integration/src/test/resources/jawn/build.sc 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 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 diff --git a/integration/src/test/resource/acyclic/build.sc b/integration/src/test/resource/acyclic/build.sc deleted file mode 100644 index f1381c7e..00000000 --- a/integration/src/test/resource/acyclic/build.sc +++ /dev/null @@ -1,39 +0,0 @@ -import mill.define.Cross -import mill.CrossModule -import mill.scalalib.{SbtModule, PublishModule, Dep} -import mill.scalalib.publish.{PomSettings, License, Developer, SCM} - -object acyclic extends CrossModule(AcyclicModule, "2.10.6", "2.11.8", "2.12.3", "2.12.4") -case class AcyclicModule(crossVersion: String) extends SbtModule with PublishModule { - def basePath = super.basePath / ammonite.ops.up - def artifactName = "acyclic" - def publishVersion = "0.1.7" - - def pomSettings = PomSettings( - description = artifactName(), - organization = "com.lihaoyi", - url = "https://github.com/lihaoyi/acyclic", - licenses = Seq( - License("MIT license", "http://www.opensource.org/licenses/mit-license.php") - ), - scm = SCM( - "git://github.com/lihaoyi/acyclic.git", - "scm:git://github.com/lihaoyi/acyclic.git" - ), - developers = Seq( - Developer("lihaoyi", "Li Haoyi","https://github.com/lihaoyi") - ) - ) - - def scalaVersion = crossVersion - def ivyDeps = Seq( - Dep.Java("org.scala-lang", "scala-compiler", scalaVersion()) - ) - object test extends Tests{ - def forkWorkingDir = ammonite.ops.pwd / 'target / 'workspace / 'acyclic - def ivyDeps = Seq( - Dep("com.lihaoyi", "utest", "0.6.0") - ) - def testFramework = "utest.runner.Framework" - } -} \ No newline at end of file diff --git a/integration/src/test/resource/better-files/build.sc b/integration/src/test/resource/better-files/build.sc deleted file mode 100644 index ace8f766..00000000 --- a/integration/src/test/resource/better-files/build.sc +++ /dev/null @@ -1,83 +0,0 @@ -import mill.define.Cross -import mill.scalalib.{SbtModule, PublishModule, Dep} -import mill.scalalib.publish.{PomSettings, License, Developer, SCM} - -trait BetterFilesModule extends SbtModule{ - def scalaVersion = "2.12.4" - def scalacOptions = Seq( - "-deprecation", // Emit warning and location for usages of deprecated APIs. - "-encoding", "utf-8", // Specify character encoding used by source files. - "-explaintypes", // Explain type errors in more detail. - "-feature", // Emit warning and location for usages of features that should be imported explicitly. - "-language:existentials", // Existential types (besides wildcard types) can be written and inferred - "-language:experimental.macros", // Allow macro definition (besides implementation and application) - "-language:higherKinds", // Allow higher-kinded types - "-language:implicitConversions", // Allow definition of implicit functions called views - "-unchecked", // Enable additional warnings where generated code depends on assumptions. - "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access. - "-Xfatal-warnings", // Fail the compilation if there are any warnings. - "-Xfuture", // Turn on future language features. - "-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver. - "-Xlint:by-name-right-associative", // By-name parameter of right associative operator. - "-Xlint:constant", // Evaluation of a constant arithmetic expression results in an error. - "-Xlint:delayedinit-select", // Selecting member of DelayedInit. - "-Xlint:doc-detached", // A Scaladoc comment appears to be detached from its element. - "-Xlint:inaccessible", // Warn about inaccessible types in method signatures. - "-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`. - "-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id. - "-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'. - "-Xlint:nullary-unit", // Warn when nullary methods return Unit. - "-Xlint:option-implicit", // Option.apply used implicit view. - "-Xlint:package-object-classes", // Class or object defined in package object. - "-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds. - "-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field. - "-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component. - "-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope. - "-Xlint:unsound-match", // Pattern match may not be typesafe. - "-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver. - "-Ypartial-unification", // Enable partial unification in type constructor inference - "-Ywarn-dead-code", // Warn when dead code is identified. - "-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined. - "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures. - "-Ywarn-infer-any", // Warn when a type argument is inferred to be `Any`. - "-Ywarn-nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'. - "-Ywarn-nullary-unit", // Warn when nullary methods return Unit. - "-Ywarn-numeric-widen", // Warn when numerics are widened. - "-Ywarn-unused:implicits", // Warn if an implicit parameter is unused. - "-Ywarn-unused:imports", // Warn if an import selector is not referenced. - "-Ywarn-unused:locals", // Warn if a local definition is unused. - "-Ywarn-unused:params", // Warn if a value parameter is unused. - "-Ywarn-unused:patvars", // Warn if a variable bound in a pattern is unused. - "-Ywarn-unused:privates", // Warn if a private member is unused. - "-Ywarn-value-discard" // Warn when non-Unit expression results are unused. - ) - override def javacOptions = Seq("-source", "1.8", "-target", "1.8", "-Xlint") - object test extends Tests{ - def projectDeps = - if (this == core.test) super.projectDeps - else super.projectDeps ++ Seq(core.test) - def ivyDeps = Seq(Dep("org.scalatest", "scalatest", "3.0.4")) - def testFramework = "org.scalatest.tools.Framework" - } -} - -object core extends BetterFilesModule - -object akka extends BetterFilesModule{ - def projectDeps = Seq(core) - def ivyDeps = Seq(Dep("com.typesafe.akka", "akka-actor", "2.5.6")) -} - -object shapeless extends BetterFilesModule{ - def projectDeps = Seq(core) - def ivyDeps = Seq(Dep("com.chuusai", "shapeless", "2.3.2")) -} - -object benchmarks extends BetterFilesModule{ - def projectDeps = Seq(core) - def ivyDeps = Seq( - Dep.Java("commons-io", "commons-io", "2.5") - // "fastjavaio" % "fastjavaio" % "1.0" from "https://github.com/williamfiset/FastJavaIO/releases/download/v1.0/fastjavaio.jar" - ) -} - diff --git a/integration/src/test/resource/jawn/build.sc b/integration/src/test/resource/jawn/build.sc deleted file mode 100644 index 074e30f9..00000000 --- a/integration/src/test/resource/jawn/build.sc +++ /dev/null @@ -1,60 +0,0 @@ -import mill.scalalib -import mill.CrossModule -import mill.scalalib.{Dep, TestModule, Module} - -object jawn extends CrossModule(JawnModule, "2.10.6", "2.11.11", "2.12.3") -case class JawnModule(crossVersion: String) extends mill.Module{ - override def basePath = super.basePath / ammonite.ops.up - - trait JawnModule extends scalalib.SbtModule{ - def scalaVersion = crossVersion - def scalacOptions = Seq( - "-deprecation", - "-optimize", - "-unchecked" - ) - def testProjectDeps: Seq[TestModule] = Nil - object test extends Tests{ - def projectDeps = super.projectDeps ++ testProjectDeps - def ivyDeps = Seq( - Dep("org.scalatest", "scalatest", "3.0.3"), - Dep("org.scalacheck", "scalacheck", "1.13.5") - ) - def testFramework = "org.scalatest.tools.Framework" - } - } - object parser extends JawnModule - - object util extends JawnModule{ - def projectDeps = Seq(parser) - def testProjectDeps = Seq(parser.test) - } - object ast extends JawnModule{ - def projectDeps = Seq(parser, util) - def testProjectDeps = Seq(parser.test, util.test) - } - class Support(ivyDeps0: Dep*)(implicit ctx: mill.Module.Ctx) extends JawnModule{ - def projectDeps = Seq[Module](parser) - def ivyDeps = ivyDeps0 - } - object support extends mill.Module{ - object argonaut extends Support(Dep("io.argonaut", "argonaut", "6.2")) - object json4s extends Support(Dep("org.json4s", "json4s-ast", "3.5.2")) - - object play extends Support(){ - def ivyDeps = mill.T{ - scalaBinaryVersion() match{ - case "2.10" => Seq(Dep("com.typesafe.play", "play-json", "2.4.11")) - case "2.11" => Seq(Dep("com.typesafe.play", "play-json", "2.5.15")) - case _ => Seq(Dep("com.typesafe.play", "play-json", "2.6.0")) - } - } - } - - object rojoma extends Support(Dep("com.rojoma", "rojoma-json", "2.4.3")) - object rojomaV3 extends Support(Dep("com.rojoma", "rojoma-json-v3", "3.7.2")){ - override def basePath = super.basePath / ammonite.ops.up / "rojoma-v3" - } - object spray extends Support(Dep("io.spray", "spray-json", "1.3.3")) - } -} \ No newline at end of file diff --git a/integration/src/test/resources/acyclic/build.sc b/integration/src/test/resources/acyclic/build.sc new file mode 100644 index 00000000..f1381c7e --- /dev/null +++ b/integration/src/test/resources/acyclic/build.sc @@ -0,0 +1,39 @@ +import mill.define.Cross +import mill.CrossModule +import mill.scalalib.{SbtModule, PublishModule, Dep} +import mill.scalalib.publish.{PomSettings, License, Developer, SCM} + +object acyclic extends CrossModule(AcyclicModule, "2.10.6", "2.11.8", "2.12.3", "2.12.4") +case class AcyclicModule(crossVersion: String) extends SbtModule with PublishModule { + def basePath = super.basePath / ammonite.ops.up + def artifactName = "acyclic" + def publishVersion = "0.1.7" + + def pomSettings = PomSettings( + description = artifactName(), + organization = "com.lihaoyi", + url = "https://github.com/lihaoyi/acyclic", + licenses = Seq( + License("MIT license", "http://www.opensource.org/licenses/mit-license.php") + ), + scm = SCM( + "git://github.com/lihaoyi/acyclic.git", + "scm:git://github.com/lihaoyi/acyclic.git" + ), + developers = Seq( + Developer("lihaoyi", "Li Haoyi","https://github.com/lihaoyi") + ) + ) + + def scalaVersion = crossVersion + def ivyDeps = Seq( + Dep.Java("org.scala-lang", "scala-compiler", scalaVersion()) + ) + object test extends Tests{ + def forkWorkingDir = ammonite.ops.pwd / 'target / 'workspace / 'acyclic + def ivyDeps = Seq( + Dep("com.lihaoyi", "utest", "0.6.0") + ) + def testFramework = "utest.runner.Framework" + } +} \ No newline at end of file diff --git a/integration/src/test/resources/better-files/build.sc b/integration/src/test/resources/better-files/build.sc new file mode 100644 index 00000000..ace8f766 --- /dev/null +++ b/integration/src/test/resources/better-files/build.sc @@ -0,0 +1,83 @@ +import mill.define.Cross +import mill.scalalib.{SbtModule, PublishModule, Dep} +import mill.scalalib.publish.{PomSettings, License, Developer, SCM} + +trait BetterFilesModule extends SbtModule{ + def scalaVersion = "2.12.4" + def scalacOptions = Seq( + "-deprecation", // Emit warning and location for usages of deprecated APIs. + "-encoding", "utf-8", // Specify character encoding used by source files. + "-explaintypes", // Explain type errors in more detail. + "-feature", // Emit warning and location for usages of features that should be imported explicitly. + "-language:existentials", // Existential types (besides wildcard types) can be written and inferred + "-language:experimental.macros", // Allow macro definition (besides implementation and application) + "-language:higherKinds", // Allow higher-kinded types + "-language:implicitConversions", // Allow definition of implicit functions called views + "-unchecked", // Enable additional warnings where generated code depends on assumptions. + "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access. + "-Xfatal-warnings", // Fail the compilation if there are any warnings. + "-Xfuture", // Turn on future language features. + "-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver. + "-Xlint:by-name-right-associative", // By-name parameter of right associative operator. + "-Xlint:constant", // Evaluation of a constant arithmetic expression results in an error. + "-Xlint:delayedinit-select", // Selecting member of DelayedInit. + "-Xlint:doc-detached", // A Scaladoc comment appears to be detached from its element. + "-Xlint:inaccessible", // Warn about inaccessible types in method signatures. + "-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`. + "-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id. + "-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'. + "-Xlint:nullary-unit", // Warn when nullary methods return Unit. + "-Xlint:option-implicit", // Option.apply used implicit view. + "-Xlint:package-object-classes", // Class or object defined in package object. + "-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds. + "-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field. + "-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component. + "-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope. + "-Xlint:unsound-match", // Pattern match may not be typesafe. + "-Yno-adapted-args", // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver. + "-Ypartial-unification", // Enable partial unification in type constructor inference + "-Ywarn-dead-code", // Warn when dead code is identified. + "-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined. + "-Ywarn-inaccessible", // Warn about inaccessible types in method signatures. + "-Ywarn-infer-any", // Warn when a type argument is inferred to be `Any`. + "-Ywarn-nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'. + "-Ywarn-nullary-unit", // Warn when nullary methods return Unit. + "-Ywarn-numeric-widen", // Warn when numerics are widened. + "-Ywarn-unused:implicits", // Warn if an implicit parameter is unused. + "-Ywarn-unused:imports", // Warn if an import selector is not referenced. + "-Ywarn-unused:locals", // Warn if a local definition is unused. + "-Ywarn-unused:params", // Warn if a value parameter is unused. + "-Ywarn-unused:patvars", // Warn if a variable bound in a pattern is unused. + "-Ywarn-unused:privates", // Warn if a private member is unused. + "-Ywarn-value-discard" // Warn when non-Unit expression results are unused. + ) + override def javacOptions = Seq("-source", "1.8", "-target", "1.8", "-Xlint") + object test extends Tests{ + def projectDeps = + if (this == core.test) super.projectDeps + else super.projectDeps ++ Seq(core.test) + def ivyDeps = Seq(Dep("org.scalatest", "scalatest", "3.0.4")) + def testFramework = "org.scalatest.tools.Framework" + } +} + +object core extends BetterFilesModule + +object akka extends BetterFilesModule{ + def projectDeps = Seq(core) + def ivyDeps = Seq(Dep("com.typesafe.akka", "akka-actor", "2.5.6")) +} + +object shapeless extends BetterFilesModule{ + def projectDeps = Seq(core) + def ivyDeps = Seq(Dep("com.chuusai", "shapeless", "2.3.2")) +} + +object benchmarks extends BetterFilesModule{ + def projectDeps = Seq(core) + def ivyDeps = Seq( + Dep.Java("commons-io", "commons-io", "2.5") + // "fastjavaio" % "fastjavaio" % "1.0" from "https://github.com/williamfiset/FastJavaIO/releases/download/v1.0/fastjavaio.jar" + ) +} + diff --git a/integration/src/test/resources/jawn/build.sc b/integration/src/test/resources/jawn/build.sc new file mode 100644 index 00000000..074e30f9 --- /dev/null +++ b/integration/src/test/resources/jawn/build.sc @@ -0,0 +1,60 @@ +import mill.scalalib +import mill.CrossModule +import mill.scalalib.{Dep, TestModule, Module} + +object jawn extends CrossModule(JawnModule, "2.10.6", "2.11.11", "2.12.3") +case class JawnModule(crossVersion: String) extends mill.Module{ + override def basePath = super.basePath / ammonite.ops.up + + trait JawnModule extends scalalib.SbtModule{ + def scalaVersion = crossVersion + def scalacOptions = Seq( + "-deprecation", + "-optimize", + "-unchecked" + ) + def testProjectDeps: Seq[TestModule] = Nil + object test extends Tests{ + def projectDeps = super.projectDeps ++ testProjectDeps + def ivyDeps = Seq( + Dep("org.scalatest", "scalatest", "3.0.3"), + Dep("org.scalacheck", "scalacheck", "1.13.5") + ) + def testFramework = "org.scalatest.tools.Framework" + } + } + object parser extends JawnModule + + object util extends JawnModule{ + def projectDeps = Seq(parser) + def testProjectDeps = Seq(parser.test) + } + object ast extends JawnModule{ + def projectDeps = Seq(parser, util) + def testProjectDeps = Seq(parser.test, util.test) + } + class Support(ivyDeps0: Dep*)(implicit ctx: mill.Module.Ctx) extends JawnModule{ + def projectDeps = Seq[Module](parser) + def ivyDeps = ivyDeps0 + } + object support extends mill.Module{ + object argonaut extends Support(Dep("io.argonaut", "argonaut", "6.2")) + object json4s extends Support(Dep("org.json4s", "json4s-ast", "3.5.2")) + + object play extends Support(){ + def ivyDeps = mill.T{ + scalaBinaryVersion() match{ + case "2.10" => Seq(Dep("com.typesafe.play", "play-json", "2.4.11")) + case "2.11" => Seq(Dep("com.typesafe.play", "play-json", "2.5.15")) + case _ => Seq(Dep("com.typesafe.play", "play-json", "2.6.0")) + } + } + } + + object rojoma extends Support(Dep("com.rojoma", "rojoma-json", "2.4.3")) + object rojomaV3 extends Support(Dep("com.rojoma", "rojoma-json-v3", "3.7.2")){ + override def basePath = super.basePath / ammonite.ops.up / "rojoma-v3" + } + object spray extends Support(Dep("io.spray", "spray-json", "1.3.3")) + } +} \ No newline at end of file diff --git a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala index b7dc722d..ba4415fa 100644 --- a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala +++ b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala @@ -7,7 +7,7 @@ import utest._ abstract class IntegrationTestSuite(repoKey: String, workspaceSlug: String) extends TestSuite{ val workspacePath = pwd / 'target / 'workspace / workspaceSlug - val buildFilePath = pwd / 'integration / 'src / 'test / 'resource / workspaceSlug + val buildFilePath = pwd / 'integration / 'src / 'test / 'resources / workspaceSlug val stdOutErr = new PrintStream(new ByteArrayOutputStream()) val stdIn = new ByteArrayInputStream(Array()) val runner = new mill.main.MainRunner( 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" 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