diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2017-11-05 06:24:14 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-11-05 06:24:14 -0800 |
| commit | 2fb5b569d30ac09cfda7ce6450c54d0fff6f32ae (patch) | |
| tree | 74ca947565a623fb7ea801973617888fb36af0c6 /scalaplugin | |
| parent | dfe12f27063874ca6ff86dee98c85b82236e1762 (diff) | |
| download | mill-2fb5b569d30ac09cfda7ce6450c54d0fff6f32ae.tar.gz mill-2fb5b569d30ac09cfda7ce6450c54d0fff6f32ae.tar.bz2 mill-2fb5b569d30ac09cfda7ce6450c54d0fff6f32ae.zip | |
Re-organize `forge/` folder according to ordering of build phases: target definition, target discovery, and target evaluation
Diffstat (limited to 'scalaplugin')
| -rw-r--r-- | scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala | 2 | ||||
| -rw-r--r-- | scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala index cc573d88..2572e802 100644 --- a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala +++ b/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala @@ -6,7 +6,7 @@ import java.io.File import ammonite.ops.{Path, ls, mkdir, pwd} import coursier.{Cache, Dependency, Fetch, MavenRepository, Module, Repository, Resolution} import forge.Target.Cacher -import forge.util.PathRef +import forge.eval.PathRef import play.api.libs.json._ import sbt.internal.inc.{FreshCompilerCache, ScalaInstance, ZincUtil} import sbt.internal.util.{ConsoleOut, MainAppender} diff --git a/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala b/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala index 217282a3..4b2f6844 100644 --- a/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala +++ b/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala @@ -3,8 +3,10 @@ package scalaplugin import ammonite.ops.pwd import coursier.{Dependency => Dep, Module => Mod} +import forge.discover.Discovered +import forge.eval.{Evaluator, PathRef} import forge.scalaplugin.Subproject.ScalaDep -import forge.util.{OSet, PathRef} +import forge.util.OSet import utest._ object MetacircularTests extends TestSuite{ |