Re-organize `forge/` folder according to ordering of build phases: target definition, target discovery, and target evaluation

8 files changed, 22 insertions, 4 deletions

diff --git a/core/src/test/examples/javac/build.sc b/core/src/test/examples/javac/build.sc
index dfbe5271..d7ba5662 100644
--- a/core/src/test/examples/javac/build.sc
+++ b/core/src/test/examples/javac/build.sc
@@ -1,11 +1,14 @@
+import forge.define.Target
+import forge.eval.PathRef
+
 object Foo {
 
   import java.io.FileOutputStream
   import java.util.jar.JarEntry
 
   import ammonite.ops.{ls, pwd, read}
-  import forge.{Discovered, Target}
-  import forge.util.{Args, PathRef}
+  import forge.discover.Discovered
+  import forge.util.Args
 
   val workspacePath = pwd / 'target / 'workspace / 'javac
   val javacSrcPath = pwd / 'src / 'test / 'examples / 'javac
diff --git a/core/src/test/scala/forge/CacherTests.scala b/core/src/test/scala/forge/CacherTests.scala
index 4c346e5e..24a540ff 100644
--- a/core/src/test/scala/forge/CacherTests.scala
+++ b/core/src/test/scala/forge/CacherTests.scala
@@ -1,5 +1,8 @@
 package forge
 
+import forge.define.Target
+import forge.discover.Discovered
+import forge.eval.Evaluator
 import forge.util.OSet
 import utest._
 import utest.framework.TestPath
diff --git a/core/src/test/scala/forge/EvaluationTests.scala b/core/src/test/scala/forge/EvaluationTests.scala
index b58d5ccc..66fe7b8d 100644
--- a/core/src/test/scala/forge/EvaluationTests.scala
+++ b/core/src/test/scala/forge/EvaluationTests.scala
@@ -1,6 +1,9 @@
 package forge
 
 
+import forge.define.Target
+import forge.discover.Discovered
+import forge.eval.Evaluator
 import forge.util.OSet
 import utest._
 import utest.framework.TestPath
diff --git a/core/src/test/scala/forge/GraphTests.scala b/core/src/test/scala/forge/GraphTests.scala
index ca825683..e608c877 100644
--- a/core/src/test/scala/forge/GraphTests.scala
+++ b/core/src/test/scala/forge/GraphTests.scala
@@ -2,6 +2,9 @@ package forge
 
 import utest._
 import TestUtil.test
+import forge.define.Target
+import forge.discover.Discovered
+import forge.eval.Evaluator
 import forge.util.OSet
 
 object GraphTests extends TestSuite{
diff --git a/core/src/test/scala/forge/JavaCompileJarTests.scala b/core/src/test/scala/forge/JavaCompileJarTests.scala
index 8b292a88..f4a5fc88 100644
--- a/core/src/test/scala/forge/JavaCompileJarTests.scala
+++ b/core/src/test/scala/forge/JavaCompileJarTests.scala
@@ -4,7 +4,10 @@ import java.io.FileOutputStream
 import java.util.jar.JarEntry
 
 import ammonite.ops._
-import forge.util.{Args, OSet, PathRef}
+import forge.define.Target
+import forge.discover.Discovered
+import forge.eval.{Evaluator, PathRef}
+import forge.util.{Args, OSet}
 import utest._
 
 object JavaCompileJarTests extends TestSuite{
diff --git a/core/src/test/scala/forge/TarjanTests.scala b/core/src/test/scala/forge/TarjanTests.scala
index 5b118368..58032b86 100644
--- a/core/src/test/scala/forge/TarjanTests.scala
+++ b/core/src/test/scala/forge/TarjanTests.scala
@@ -1,4 +1,5 @@
 package forge
+import forge.eval.Tarjans
 import utest._
 object TarjanTests extends TestSuite{
   def check(input: Seq[Seq[Int]], expected: Seq[Seq[Int]]) = {
diff --git a/core/src/test/scala/forge/TestGraphs.scala b/core/src/test/scala/forge/TestGraphs.scala
index 0d6040eb..5c30f948 100644
--- a/core/src/test/scala/forge/TestGraphs.scala
+++ b/core/src/test/scala/forge/TestGraphs.scala
@@ -1,6 +1,6 @@
 package forge
 
-import forge.Target.Cacher
+import forge.define.Target.Cacher
 import forge.TestUtil.test
 
 class TestGraphs(){
diff --git a/core/src/test/scala/forge/TestUtil.scala b/core/src/test/scala/forge/TestUtil.scala
index 9337fbe0..005bcfef 100644
--- a/core/src/test/scala/forge/TestUtil.scala
+++ b/core/src/test/scala/forge/TestUtil.scala
@@ -1,7 +1,9 @@
 package forge
 
+import forge.define.Target
 import forge.util.{Args, OSet}
 import utest.assert
+
 import scala.collection.mutable
 
 object TestUtil {