diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2017-10-29 12:51:38 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-10-29 12:51:38 -0700 |
commit | 9b444f8d2df2e0ceb030cdcb6c8accb1d6cd3c69 (patch) | |
tree | b58278bfac6b20cc0a2dfeb1774cee268c32eddc /src | |
parent | cdf5461a5fc9999b3fe496af1e4e8dfbc3e8f9c0 (diff) | |
download | mill-9b444f8d2df2e0ceb030cdcb6c8accb1d6cd3c69.tar.gz mill-9b444f8d2df2e0ceb030cdcb6c8accb1d6cd3c69.tar.bz2 mill-9b444f8d2df2e0ceb030cdcb6c8accb1d6cd3c69.zip |
Move `Args` into the `util/` package
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/forge/Evaluator.scala | 2 | ||||
-rw-r--r-- | src/main/scala/forge/Target.scala | 2 | ||||
-rw-r--r-- | src/main/scala/forge/util/Args.scala (renamed from src/main/scala/forge/Args.scala) | 3 | ||||
-rw-r--r-- | src/test/scala/forge/Main.scala | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/main/scala/forge/Evaluator.scala b/src/main/scala/forge/Evaluator.scala index e6366f42..38cd856b 100644 --- a/src/main/scala/forge/Evaluator.scala +++ b/src/main/scala/forge/Evaluator.scala @@ -5,7 +5,7 @@ import play.api.libs.json.{JsValue, Json} import scala.collection.mutable import ammonite.ops._ -import forge.util.{MultiBiMap, OSet} +import forge.util.{Args, MultiBiMap, OSet} class Evaluator(workspacePath: Path, labeling: Map[Target[_], Seq[String]]){ diff --git a/src/main/scala/forge/Target.scala b/src/main/scala/forge/Target.scala index 3b4ba2a8..e96a8bf5 100644 --- a/src/main/scala/forge/Target.scala +++ b/src/main/scala/forge/Target.scala @@ -2,7 +2,7 @@ package forge import ammonite.ops.{ls, mkdir} -import forge.util.PathRef +import forge.util.{Args, PathRef} import play.api.libs.json.{Format, JsValue, Json} abstract class Target[T](implicit formatter: Format[T]) extends Target.Ops[T]{ /** diff --git a/src/main/scala/forge/Args.scala b/src/main/scala/forge/util/Args.scala index e73af6c1..23102572 100644 --- a/src/main/scala/forge/Args.scala +++ b/src/main/scala/forge/util/Args.scala @@ -1,5 +1,4 @@ -package forge - +package forge.util class Args(val args: IndexedSeq[_], val dest: ammonite.ops.Path){ def length = args.length diff --git a/src/test/scala/forge/Main.scala b/src/test/scala/forge/Main.scala index 6f281f54..3f5732c9 100644 --- a/src/test/scala/forge/Main.scala +++ b/src/test/scala/forge/Main.scala @@ -4,7 +4,7 @@ import java.util.jar.JarEntry import collection.JavaConverters._ import ammonite.ops._ -import forge.util.{OSet, PathRef} +import forge.util.{Args, OSet, PathRef} object Main{ val sourceRoot = Target.path(pwd / 'src / 'test / 'resources / 'example / 'src) val resourceRoot = Target.path(pwd / 'src / 'test / 'resources / 'example / 'resources) |