diff options
| -rwxr-xr-x | build.sc | 5 | ||||
| -rwxr-xr-x | ci/test-mill-0.sh | 2 | ||||
| -rwxr-xr-x | ci/test-mill-bootstrap.sh | 2 | ||||
| -rw-r--r-- | contrib/playlib/test/src/mill/playlib/HelloWorldTests.scala (renamed from contrib/playlib/test/src/mill/playlib/HelloWorldRouterTests.scala) | 2 | ||||
| -rw-r--r-- | contrib/twirllib/test/resources/hello-world/core/views/hello.scala.html (renamed from contrib/playlib/test/resources/hello-world/core/views/hello.scala.html) | 0 |
5 files changed, 7 insertions, 4 deletions
@@ -243,9 +243,12 @@ object contrib extends MillModule { ) } - object playlib extends MillModule { + object twirllib extends MillModule { def moduleDeps = Seq(scalalib) + } + object playlib extends MillModule { + def moduleDeps = Seq(scalalib) } object scalapblib extends MillModule { diff --git a/ci/test-mill-0.sh b/ci/test-mill-0.sh index e8d8f67c..5d8143b0 100755 --- a/ci/test-mill-0.sh +++ b/ci/test-mill-0.sh @@ -6,4 +6,4 @@ set -eux git clean -xdf # Run tests -mill -i all {main,scalalib,scalajslib,contri.playlib,main.client,contrib.scalapblib}.test +mill -i all {main,scalalib,scalajslib,contrib.playlib,main.client,contrib.scalapblib}.test diff --git a/ci/test-mill-bootstrap.sh b/ci/test-mill-bootstrap.sh index df8d086d..f95c0646 100755 --- a/ci/test-mill-bootstrap.sh +++ b/ci/test-mill-bootstrap.sh @@ -27,4 +27,4 @@ git clean -xdf rm -rf ~/.mill # Use second build to run tests using Mill -~/mill-2 -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.scalapblib}.test +~/mill-2 -i all {main,scalalib,scalajslib,contrib.twirllib,contrib.playlib,contrib.scalapblib}.test diff --git a/contrib/playlib/test/src/mill/playlib/HelloWorldRouterTests.scala b/contrib/playlib/test/src/mill/playlib/HelloWorldTests.scala index f98ba749..e4dc7399 100644 --- a/contrib/playlib/test/src/mill/playlib/HelloWorldRouterTests.scala +++ b/contrib/playlib/test/src/mill/playlib/HelloWorldTests.scala @@ -5,7 +5,7 @@ import mill.util.{TestEvaluator, TestUtil} import utest.framework.TestPath import utest.{TestSuite, Tests, assert, _} -object HelloWorldRouterTests extends TestSuite { +object HelloWorldTests extends TestSuite { trait HelloBase extends TestUtil.BaseModule { override def millSourcePath: Path = TestUtil.getSrcPathBase() / millOuterCtx.enclosing.split('.') diff --git a/contrib/playlib/test/resources/hello-world/core/views/hello.scala.html b/contrib/twirllib/test/resources/hello-world/core/views/hello.scala.html index 3603fe07..3603fe07 100644 --- a/contrib/playlib/test/resources/hello-world/core/views/hello.scala.html +++ b/contrib/twirllib/test/resources/hello-world/core/views/hello.scala.html |