summaryrefslogtreecommitdiff
path: root/main/test
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-12-18 21:11:47 -0800
committerGitHub <noreply@github.com>2018-12-18 21:11:47 -0800
commitde175e69977082e35539097a54d381e465dddf8e (patch)
treecedf8de1dde57b7c9f70dfaa4b212906db775684 /main/test
parentea36ea3da18d3720e124b60235e1153f6c31518c (diff)
downloadmill-de175e69977082e35539097a54d381e465dddf8e.tar.gz
mill-de175e69977082e35539097a54d381e465dddf8e.tar.bz2
mill-de175e69977082e35539097a54d381e465dddf8e.zip
Generalize Zinc Worker (#514)
* Generalize Zinc worker - Compiler bridges can now be either pre-compiled or on-demand-compiled - Scala library/compiler jar discovery is now configurable - Zinc compiler cache is now configurable, rather than being hardcoded at n=1 * . * update constructor args * remove duplicate util/AggWrapper.scala file * fix * fix * fix * cleanup
Diffstat (limited to 'main/test')
-rw-r--r--main/test/resources/examples/javac/build.sc2
-rw-r--r--main/test/src/define/CacherTests.scala2
-rw-r--r--main/test/src/define/GraphTests.scala2
-rw-r--r--main/test/src/eval/EvaluationTests.scala2
-rw-r--r--main/test/src/eval/JavaCompileJarTests.scala7
-rw-r--r--main/test/src/util/TestEvaluator.scala2
-rw-r--r--main/test/src/util/TestUtil.scala2
7 files changed, 10 insertions, 9 deletions
diff --git a/main/test/resources/examples/javac/build.sc b/main/test/resources/examples/javac/build.sc
index 2ed9f915..17366219 100644
--- a/main/test/resources/examples/javac/build.sc
+++ b/main/test/resources/examples/javac/build.sc
@@ -2,7 +2,7 @@ import mill.T
import mill.eval.JavaCompileJarTests.compileAll
import mill.api.PathRef
import mill.modules.Jvm
-import mill.util.Loose
+import mill.api.Loose
def sourceRootPath = millSourcePath / 'src
def resourceRootPath = millSourcePath / 'resources
diff --git a/main/test/src/define/CacherTests.scala b/main/test/src/define/CacherTests.scala
index 59ebf3f6..1524e5c1 100644
--- a/main/test/src/define/CacherTests.scala
+++ b/main/test/src/define/CacherTests.scala
@@ -1,7 +1,7 @@
package mill.define
import mill.util.{DummyLogger, TestEvaluator, TestUtil}
-import mill.util.Strict.Agg
+import mill.api.Strict.Agg
import mill.T
import mill.api.Result.Success
import utest._
diff --git a/main/test/src/define/GraphTests.scala b/main/test/src/define/GraphTests.scala
index 224ce59f..b36dbf95 100644
--- a/main/test/src/define/GraphTests.scala
+++ b/main/test/src/define/GraphTests.scala
@@ -4,7 +4,7 @@ package mill.define
import mill.eval.Evaluator
import mill.util.{TestGraphs, TestUtil}
import utest._
-import mill.util.Strict.Agg
+import mill.api.Strict.Agg
object GraphTests extends TestSuite{
val tests = Tests{
diff --git a/main/test/src/eval/EvaluationTests.scala b/main/test/src/eval/EvaluationTests.scala
index 74f9088c..7f924db2 100644
--- a/main/test/src/eval/EvaluationTests.scala
+++ b/main/test/src/eval/EvaluationTests.scala
@@ -5,7 +5,7 @@ import mill.util.TestUtil.{Test, test}
import mill.define.{Discover, Graph, Target, Task}
import mill.{Module, T}
import mill.util.{DummyLogger, TestEvaluator, TestGraphs, TestUtil}
-import mill.util.Strict.Agg
+import mill.api.Strict.Agg
import utest._
import utest.framework.TestPath
diff --git a/main/test/src/eval/JavaCompileJarTests.scala b/main/test/src/eval/JavaCompileJarTests.scala
index 426c6ea6..0f9002df 100644
--- a/main/test/src/eval/JavaCompileJarTests.scala
+++ b/main/test/src/eval/JavaCompileJarTests.scala
@@ -4,12 +4,13 @@ import mill.define.{Discover, Input, Target, Task}
import mill.modules.Jvm
import mill.api.Ctx.Dest
import mill.{Module, T}
-import mill.util.{DummyLogger, Loose, TestEvaluator, TestUtil}
-import mill.util.Strict.Agg
+import mill.util.{DummyLogger, TestEvaluator, TestUtil}
+import mill.api.Strict.Agg
+import mill.api.Loose
import utest._
import mill._
object JavaCompileJarTests extends TestSuite{
- def compileAll(sources: mill.util.Loose.Agg[PathRef])(implicit ctx: Dest) = {
+ def compileAll(sources: mill.api.Loose.Agg[PathRef])(implicit ctx: Dest) = {
os.makeDir.all(ctx.dest)
os.proc("javac", sources.map(_.path.toString()).toSeq, "-d", ctx.dest).call(ctx.dest)
diff --git a/main/test/src/util/TestEvaluator.scala b/main/test/src/util/TestEvaluator.scala
index 9a235679..81c8fe12 100644
--- a/main/test/src/util/TestEvaluator.scala
+++ b/main/test/src/util/TestEvaluator.scala
@@ -3,7 +3,7 @@ package mill.util
import mill.define.{Input, Target, Task}
import mill.api.Result.OuterStack
import mill.eval.{Evaluator, Result}
-import mill.util.Strict.Agg
+import mill.api.Strict.Agg
import utest.assert
import utest.framework.TestPath
diff --git a/main/test/src/util/TestUtil.scala b/main/test/src/util/TestUtil.scala
index baab2992..462b7f5c 100644
--- a/main/test/src/util/TestUtil.scala
+++ b/main/test/src/util/TestUtil.scala
@@ -5,7 +5,7 @@ import mill.define._
import mill.api.Result
import mill.api.Result.OuterStack
import utest.assert
-import mill.util.Strict.Agg
+import mill.api.Strict.Agg
import utest.framework.TestPath
import scala.collection.mutable