diff options
| -rw-r--r-- | build.sbt | 2 | ||||
| -rwxr-xr-x | build.sc | 1 | ||||
| -rwxr-xr-x | ci/test2.sh | 6 | ||||
| -rwxr-xr-x | ci/test3.sh | 6 | ||||
| -rw-r--r-- | integration/src/test/scala/mill/integration/IntegrationTestSuite.scala | 2 | ||||
| -rw-r--r-- | scalajslib/jsbridges/0.6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala (renamed from scalajslib/bridge_0_6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala) | 0 | ||||
| -rw-r--r-- | scalajslib/jsbridges/1.0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala (renamed from scalajslib/bridge_1_0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala) | 0 |
7 files changed, 4 insertions, 13 deletions
@@ -155,7 +155,7 @@ lazy val scalajslib = project def jsbridge(binary: String, version: String) = Project( id = "scalajsbridge_" + binary.replace('.', '_'), - base = file("scalajslib/bridge_" + binary.replace('.', '_')) + base = file("scalajslib/jsbridges/" + binary) ) .settings( organization := "com.lihaoyi", @@ -134,7 +134,6 @@ object scalajslib extends MillModule { object jsbridges extends Cross[JsBridgeModule]("0.6", "1.0") class JsBridgeModule(scalajsBinary: String) extends MillModule{ - def basePath = super.basePath / ammonite.ops.up / s"bridge_${scalajsBinary.replace('.', '_')}" val scalajsVersion = scalajsBinary match { case "0.6" => "0.6.21" case "1.0" => "1.0.0-M2" diff --git a/ci/test2.sh b/ci/test2.sh index a3705bc5..28fa65cd 100755 --- a/ci/test2.sh +++ b/ci/test2.sh @@ -8,8 +8,4 @@ git clean -xdf sbt bin/test:assembly # Run tests using -target/bin/mill core.test -target/bin/mill scalalib.test -target/bin/mill scalajslib.test -target/bin/mill integration.test -target/bin/mill devAssembly +target/bin/mill --all {core,scalalib,scalajslib,integration}.test devAssembly diff --git a/ci/test3.sh b/ci/test3.sh index f7bbf9ad..0be934c1 100755 --- a/ci/test3.sh +++ b/ci/test3.sh @@ -12,8 +12,4 @@ sbt bin/test:assembly target/bin/mill devAssembly # Second build & run tests using Mill -out/devAssembly/dest core.test -out/devAssembly/dest scalalib.test -out/devAssembly/dest scalajslib.test -out/devAssembly/dest integration.test -out/devAssembly/dest devAssembly +out/devAssembly/dest --all {core,scalalib,scalajslib,integration}.test devAssembly diff --git a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala index 82f4de72..ba4415fa 100644 --- a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala +++ b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala @@ -8,7 +8,7 @@ import utest._ abstract class IntegrationTestSuite(repoKey: String, workspaceSlug: String) extends TestSuite{ val workspacePath = pwd / 'target / 'workspace / workspaceSlug val buildFilePath = pwd / 'integration / 'src / 'test / 'resources / workspaceSlug - val stdOutErr = System.out//new PrintStream(new ByteArrayOutputStream()) + val stdOutErr = new PrintStream(new ByteArrayOutputStream()) val stdIn = new ByteArrayInputStream(Array()) val runner = new mill.main.MainRunner( ammonite.main.Cli.Config(wd = workspacePath), false, diff --git a/scalajslib/bridge_0_6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala b/scalajslib/jsbridges/0.6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala index 4826b1cd..4826b1cd 100644 --- a/scalajslib/bridge_0_6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala +++ b/scalajslib/jsbridges/0.6/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala diff --git a/scalajslib/bridge_1_0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala b/scalajslib/jsbridges/1.0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala index ef896726..ef896726 100644 --- a/scalajslib/bridge_1_0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala +++ b/scalajslib/jsbridges/1.0/src/main/scala/mill/scalajslib/bridge/ScalaJSLinkerBridge.scala |