diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2019-05-19 15:15:24 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-19 15:15:24 +0800 |
commit | 68505aad4a22686594965bc910e60c8d2b6a95d4 (patch) | |
tree | 4c2099e21593a840c7119901becc0cbb8682956f /main/core/src/eval/Evaluator.scala | |
parent | 7d706641f6f9caa0509903f691d16d78402b4623 (diff) | |
download | mill-68505aad4a22686594965bc910e60c8d2b6a95d4.tar.gz mill-68505aad4a22686594965bc910e60c8d2b6a95d4.tar.bz2 mill-68505aad4a22686594965bc910e60c8d2b6a95d4.zip |
Bump ammonite to 1.6.7 (#610)
* bump ammonite to 1.6.7
* upgrade all the things
* add scalaj-http shims for bootstrapping
* wip
* tweak-error-message
* tweak coursier
* .
Diffstat (limited to 'main/core/src/eval/Evaluator.scala')
-rw-r--r-- | main/core/src/eval/Evaluator.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/core/src/eval/Evaluator.scala b/main/core/src/eval/Evaluator.scala index ebb00ef1..f4ec8ff9 100644 --- a/main/core/src/eval/Evaluator.scala +++ b/main/core/src/eval/Evaluator.scala @@ -32,7 +32,7 @@ case class Evaluator(home: os.Path, externalOutPath: os.Path, rootModule: mill.define.BaseModule, log: Logger, - classLoaderSig: Seq[(Either[String, os.Path], Long)] = Evaluator.classLoaderSig, + classLoaderSig: Seq[(Either[String, java.net.URL], Long)] = Evaluator.classLoaderSig, workerCache: mutable.Map[Segments, (Int, Any)] = mutable.Map.empty, env : Map[String, String] = Evaluator.defaultEnv, failFast: Boolean = true @@ -374,7 +374,7 @@ object Evaluator{ implicit val rw: upickle.default.ReadWriter[Cached] = upickle.default.macroRW } case class State(rootModule: mill.define.BaseModule, - classLoaderSig: Seq[(Either[String, os.Path], Long)], + classLoaderSig: Seq[(Either[String, java.net.URL], Long)], workerCache: mutable.Map[Segments, (Int, Any)], watched: Seq[(os.Path, Long)]) // This needs to be a ThreadLocal because we need to pass it into the body of |