Interpolates $MILL_VERSION in ivy imports (#649)

* Interpolates $MILL_VERSION in ivy imports

This overrides the default $ivy magic import by replacing the
`$MILL_VERSION` string with mill's version, in order to facilitate
the loading/update of contrib modules.

Ammonite had to be bumped to 1.6.9

* Removed bloop import

* AmmoniteExit import fix

* Removed repl dep check

* Removed problematic check

* Made ammonite version override-able

3 files changed, 14 insertions, 2 deletions

diff --git a/main/core/src/util/Compat.scala b/main/core/src/util/Compat.scala
new file mode 100644
index 00000000..859f3747
--- /dev/null
+++ b/main/core/src/util/Compat.scala
@@ -0,0 +1,13 @@
+package mill.util
+
+import scala.reflect.macros.blackbox.Context
+
+object Compat{
+  def copyAnnotatedType(c: Context)
+                       (tpe: c.universe.AnnotatedType,
+                        newAnnots: List[c.universe.Annotation]) = {
+    import c.universe.compat._
+
+    c.universe.AnnotatedType(newAnnots, tpe.underlying)
+  }
+}
diff --git a/main/core/src/util/Router.scala b/main/core/src/util/Router.scala
index 5dd3c947..9504b937 100644
--- a/main/core/src/util/Router.scala
+++ b/main/core/src/util/Router.scala
@@ -1,6 +1,5 @@
 package mill.util
 
-import ammonite.main.Compat
 import language.experimental.macros
 
 import scala.annotation.StaticAnnotation
diff --git a/main/core/src/util/Scripts.scala b/main/core/src/util/Scripts.scala
index 65eb6b2b..f61d5cb5 100644
--- a/main/core/src/util/Scripts.scala
+++ b/main/core/src/util/Scripts.scala
@@ -3,7 +3,7 @@ package mill.util
 import java.nio.file.NoSuchFileException
 
 
-import ammonite.runtime.Evaluator.AmmoniteExit
+import ammonite.interp.api.AmmoniteExit
 import ammonite.util.Name.backtickWrap
 import ammonite.util.Util.CodeSource
 import ammonite.util.{Name, Res, Util}