From 753c8dc3b296b8c53e5542a9da192e066beb2eef Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Tue, 2 Jan 2018 18:07:05 -0800 Subject: lowercase build module names in `integration/` tests to line up with SBT conventions --- .../src/test/resource/better-files/build.sc | 18 +++++++------- integration/src/test/resource/jawn/build.sc | 28 +++++++++++----------- .../scala/mill/integration/BetterFilesTests.scala | 6 ++--- .../test/scala/mill/integration/JawnTests.scala | 4 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'integration') diff --git a/integration/src/test/resource/better-files/build.sc b/integration/src/test/resource/better-files/build.sc index 6ce3ebf4..2b3f7473 100644 --- a/integration/src/test/resource/better-files/build.sc +++ b/integration/src/test/resource/better-files/build.sc @@ -53,27 +53,27 @@ trait BetterFilesModule extends SbtModule{ outer => override def javacOptions = Seq("-source", "1.8", "-target", "1.8", "-Xlint") object test extends this.Tests{ def projectDeps = - if (this == Core.test) Seq(Core) - else Seq(outer, Core.test) + if (this == core.test) Seq(core) + else Seq(outer, core.test) def ivyDeps = Seq(Dep("org.scalatest", "scalatest", "3.0.4")) def testFramework = "org.scalatest.tools.Framework" } } -object Core extends BetterFilesModule{ +object core extends BetterFilesModule{ def basePath = ammonite.ops.pwd / 'target / 'workspace / "better-files" / 'core } -object Akka extends BetterFilesModule{ - def projectDeps = Seq(Core) +object akka extends BetterFilesModule{ + def projectDeps = Seq(core) def basePath = ammonite.ops.pwd / 'target / 'workspace / "better-files" / 'akka def ivyDeps = Seq(Dep("com.typesafe.akka", "akka-actor", "2.5.6")) } -object ShapelessScanner extends BetterFilesModule{ - def projectDeps = Seq(Core) +object shapelessScanner extends BetterFilesModule{ + def projectDeps = Seq(core) def basePath = ammonite.ops.pwd / 'target / 'workspace / "better-files" / 'shapeless def ivyDeps = Seq(Dep("com.chuusai", "shapeless", "2.3.2")) } -object Benchmarks extends BetterFilesModule{ - def projectDeps = Seq(Core) +object benchmarks extends BetterFilesModule{ + def projectDeps = Seq(core) def basePath = ammonite.ops.pwd / 'target / 'workspace / "better-files" / 'benchmarks def ivyDeps = Seq( Dep.Java("commons-io", "commons-io", "2.5") diff --git a/integration/src/test/resource/jawn/build.sc b/integration/src/test/resource/jawn/build.sc index c23a4ec7..60faf70b 100644 --- a/integration/src/test/resource/jawn/build.sc +++ b/integration/src/test/resource/jawn/build.sc @@ -22,28 +22,28 @@ val jawn = for{ def testFramework = "org.scalatest.tools.Framework" } } - object Parser extends JawnModule{ + object parser extends JawnModule{ def basePath = ammonite.ops.pwd / 'target / 'workspace / 'jawn / 'parser } - object Util extends JawnModule{ - def projectDeps = Seq(Parser) - def testProjectDeps = Seq(Parser.test) + object util extends JawnModule{ + def projectDeps = Seq(parser) + def testProjectDeps = Seq(parser.test) def basePath = ammonite.ops.pwd / 'target / 'workspace / 'jawn / 'util } - object Ast extends JawnModule{ - def projectDeps = Seq(Parser, Util) - def testProjectDeps = Seq(Parser.test, Util.test) + object ast extends JawnModule{ + def projectDeps = Seq(parser, util) + def testProjectDeps = Seq(parser.test, util.test) def basePath = ammonite.ops.pwd / 'target / 'workspace / 'jawn / 'ast } class Support(name: String, ivyDeps0: Dep*) extends JawnModule{ - def projectDeps = Seq[Module](Parser) + def projectDeps = Seq[Module](parser) def basePath = ammonite.ops.pwd / 'target / 'workspace / 'jawn / 'support / name def ivyDeps = ivyDeps0 } - object Argonaut extends Support("argonaut", Dep("io.argonaut", "argonaut", "6.2")) - object Json4s extends Support("json4s", Dep("org.json4s", "json4s-ast", "3.5.2")) + object argonaut extends Support("argonaut", Dep("io.argonaut", "argonaut", "6.2")) + object json4s extends Support("json4s", Dep("org.json4s", "json4s-ast", "3.5.2")) - object Play extends Support("play"){ + object play extends Support("play"){ def ivyDeps = mill.T{ scalaBinaryVersion() match{ case "2.10" => Seq(Dep("com.typesafe.play", "play-json", "2.4.11")) @@ -53,7 +53,7 @@ val jawn = for{ } } - object Rojoma extends Support("rojoma", Dep("com.rojoma", "rojoma-json", "2.4.3")) - object RojomaV3 extends Support("rojoma-v3", Dep("com.rojoma", "rojoma-json-v3", "3.7.2")) - object Spray extends Support("spray", Dep("io.spray", "spray-json", "1.3.3")) + object rojoma extends Support("rojoma", Dep("com.rojoma", "rojoma-json", "2.4.3")) + object rojomaV3 extends Support("rojoma-v3", Dep("com.rojoma", "rojoma-json-v3", "3.7.2")) + object spray extends Support("spray", Dep("io.spray", "spray-json", "1.3.3")) } \ No newline at end of file diff --git a/integration/src/test/scala/mill/integration/BetterFilesTests.scala b/integration/src/test/scala/mill/integration/BetterFilesTests.scala index b14709a4..1fcb007f 100644 --- a/integration/src/test/scala/mill/integration/BetterFilesTests.scala +++ b/integration/src/test/scala/mill/integration/BetterFilesTests.scala @@ -8,13 +8,13 @@ object BetterFilesTests extends IntegrationTestSuite("MILL_BETTERFILES_REPO", "b initWorkspace() 'test - { - assert(eval("Core.test")) - assert(eval("Akka.test")) + assert(eval("core.test")) + assert(eval("akka.test")) for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "scala")){ write.append(scalaFile, "\n}") } - assert(!eval("Akka.test")) + assert(!eval("akka.test")) } } diff --git a/integration/src/test/scala/mill/integration/JawnTests.scala b/integration/src/test/scala/mill/integration/JawnTests.scala index 6071113d..21c9f133 100644 --- a/integration/src/test/scala/mill/integration/JawnTests.scala +++ b/integration/src/test/scala/mill/integration/JawnTests.scala @@ -8,7 +8,7 @@ object JawnTests extends IntegrationTestSuite("MILL_JAWN_REPO", "jawn") { initWorkspace() def check(scalaVersion: String) = { - val firstCompile = eval(s"jawn[$scalaVersion].Parser.test") + val firstCompile = eval(s"jawn[$scalaVersion].parser.test") assert( firstCompile, @@ -20,7 +20,7 @@ object JawnTests extends IntegrationTestSuite("MILL_JAWN_REPO", "jawn") { write.append(scalaFile, "\n}") } - val brokenCompile = eval(s"jawn[$scalaVersion].Parser.test") + val brokenCompile = eval(s"jawn[$scalaVersion].parser.test") assert(!brokenCompile) } -- cgit v1.2.3