From fe8667d58aef03e8b97c1361495ab5d851deee60 Mon Sep 17 00:00:00 2001
From: Olivier Mélois <baccata64@gmail.com>
Date: Mon, 8 Jul 2019 10:33:31 +0200
Subject: 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
---
 scalalib/src/ScalaModule.scala          | 8 +++++++-
 scalalib/src/Versions.scala             | 2 +-
 scalalib/test/src/HelloWorldTests.scala | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'scalalib')

diff --git a/scalalib/src/ScalaModule.scala b/scalalib/src/ScalaModule.scala
index f45a7e98..0ebd5700 100644
--- a/scalalib/src/ScalaModule.scala
+++ b/scalalib/src/ScalaModule.scala
@@ -196,6 +196,12 @@ trait ScalaModule extends JavaModule { outer =>
     }
   }
 
+  /**
+   * Ammonite's version used in the `repl` command is by default
+   * set to the one Mill is built against.
+   */
+  def ammoniteVersion = T(Versions.ammonite)
+
   /**
     * Dependencies that are necessary to run the Ammonite Scala REPL
     */
@@ -205,7 +211,7 @@ trait ScalaModule extends JavaModule { outer =>
     unmanagedClasspath() ++
     resolveDeps(T.task{
       runIvyDeps() ++ scalaLibraryIvyDeps() ++ transitiveIvyDeps() ++
-      Agg(ivy"com.lihaoyi:::ammonite:${Versions.ammonite}")
+      Agg(ivy"com.lihaoyi:::ammonite:${ammoniteVersion()}")
     })()
   }
 
diff --git a/scalalib/src/Versions.scala b/scalalib/src/Versions.scala
index 973b05ed..3fddd545 100644
--- a/scalalib/src/Versions.scala
+++ b/scalalib/src/Versions.scala
@@ -2,7 +2,7 @@ package mill.scalalib
 
 object Versions {
   // Keep synchronized with ammonite dependency in core in build.sc
-  val ammonite = "1.6.7"
+  val ammonite = "1.6.9"
   // Keep synchronized with zinc dependency in scalalib.worker in build.sc
   val zinc = "1.2.5"
 }
diff --git a/scalalib/test/src/HelloWorldTests.scala b/scalalib/test/src/HelloWorldTests.scala
index 57750991..d74d7d64 100644
--- a/scalalib/test/src/HelloWorldTests.scala
+++ b/scalalib/test/src/HelloWorldTests.scala
@@ -212,6 +212,7 @@ object HelloWorldTests extends TestSuite {
     object foo extends ScalaModule {
       def scalaVersion = "2.11.8"
       override def scalaOrganization = "org.typelevel"
+      override def ammoniteVersion = "1.6.7"
 
       def ivyDeps = Agg(
         ivy"com.github.julien-truffaut::monocle-macro::1.4.0"
@@ -241,7 +242,7 @@ object HelloWorldTests extends TestSuite {
   object HelloWorldFlags extends HelloBase{
     object core extends ScalaModule {
       def scalaVersion = "2.12.4"
-      
+
       def scalacOptions = super.scalacOptions() ++ Seq(
         "-Ypartial-unification"
       )
-- 
cgit v1.2.3