From de175e69977082e35539097a54d381e465dddf8e Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Tue, 18 Dec 2018 21:11:47 -0800
Subject: 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
---
 main/src/main/ReplApplyHandler.scala | 2 +-
 main/src/main/RunScript.scala        | 2 +-
 main/src/modules/Jvm.scala           | 2 +-
 main/src/modules/Util.scala          | 5 +++--
 main/src/package.scala               | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'main/src')

diff --git a/main/src/main/ReplApplyHandler.scala b/main/src/main/ReplApplyHandler.scala
index a8e467d4..786a1409 100644
--- a/main/src/main/ReplApplyHandler.scala
+++ b/main/src/main/ReplApplyHandler.scala
@@ -6,7 +6,7 @@ import mill.define.Segment.Label
 import mill.define._
 import mill.eval.{Evaluator, Result}
 
-import mill.util.Strict.Agg
+import mill.api.Strict.Agg
 
 import scala.collection.mutable
 object ReplApplyHandler{
diff --git a/main/src/main/RunScript.scala b/main/src/main/RunScript.scala
index 47526631..b858c8b9 100644
--- a/main/src/main/RunScript.scala
+++ b/main/src/main/RunScript.scala
@@ -11,7 +11,7 @@ import mill.define._
 import mill.eval.{Evaluator, PathRef, Result}
 import mill.util.{EitherOps, ParseArgs, Watched}
 import mill.api.Logger
-import mill.util.Strict.Agg
+import mill.api.Strict.Agg
 
 import scala.collection.mutable
 import scala.reflect.ClassTag
diff --git a/main/src/modules/Jvm.scala b/main/src/modules/Jvm.scala
index 1a51ed8b..e17631e3 100644
--- a/main/src/modules/Jvm.scala
+++ b/main/src/modules/Jvm.scala
@@ -15,7 +15,7 @@ import mill.main.client.InputPumper
 import mill.eval.{PathRef, Result}
 import mill.util.Ctx
 import mill.api.IO
-import mill.util.Loose.Agg
+import mill.api.Loose.Agg
 
 import scala.collection.mutable
 import scala.collection.JavaConverters._
diff --git a/main/src/modules/Util.scala b/main/src/modules/Util.scala
index 2b98a304..029626fe 100644
--- a/main/src/modules/Util.scala
+++ b/main/src/modules/Util.scala
@@ -3,7 +3,8 @@ package mill.modules
 
 import coursier.Repository
 import mill.api.{PathRef, IO}
-import mill.util.{Ctx, Loose}
+import mill.util.Ctx
+import mill.api.Loose
 
 
 object Util {
@@ -55,7 +56,7 @@ object Util {
     val localPath = sys.props(key)
     if (localPath != null) {
       mill.api.Result.Success(
-        Loose.Agg.from(localPath.split(',').map(p => PathRef(os.Path(p), quick = true)))
+        mill.api.Loose.Agg.from(localPath.split(',').map(p => PathRef(os.Path(p), quick = true)))
       )
     } else {
       mill.modules.Jvm.resolveDependencies(
diff --git a/main/src/package.scala b/main/src/package.scala
index 0ccd094f..6bcb1bdf 100644
--- a/main/src/package.scala
+++ b/main/src/package.scala
@@ -7,6 +7,6 @@ package object mill extends JsonFormatters{
   type PathRef = mill.api.PathRef
   type Module = define.Module
   type Cross[T] = define.Cross[T]
-  type Agg[T] = util.Loose.Agg[T]
-  val Agg = util.Loose.Agg
+  type Agg[T] = mill.api.Loose.Agg[T]
+  val Agg = mill.api.Loose.Agg
 }
-- 
cgit v1.2.3