diff options
author | Nikolay Tatarinov <5min4eq.unity@gmail.com> | 2017-12-17 18:34:02 +0300 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-12-17 07:34:02 -0800 |
commit | 0817b4c5975182cd72bc27a3d22d9e1dd54bc105 (patch) | |
tree | 6ae7bcd2575a4cf5d9d4999223dfe48ba79dafe1 | |
parent | 02455ac5105a9bf542ef09e6f495fb9065ca493e (diff) | |
download | mill-0817b4c5975182cd72bc27a3d22d9e1dd54bc105.tar.gz mill-0817b4c5975182cd72bc27a3d22d9e1dd54bc105.tar.bz2 mill-0817b4c5975182cd72bc27a3d22d9e1dd54bc105.zip |
fix build.sc to build itself with newer version of ammonite (#70)
-rwxr-xr-x | build.sc | 7 | ||||
-rw-r--r-- | scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala | 4 |
2 files changed, 8 insertions, 3 deletions
@@ -1,4 +1,5 @@ import ammonite.ops._ +import coursier.maven.MavenRepository import mill._ import mill.scalaplugin._ import mill.modules.Jvm.createAssembly @@ -20,6 +21,10 @@ trait MillModule extends SbtScalaModule{ outer => def scalacOptions = Seq("-P:acyclic:force") def scalacPluginIvyDeps = Seq(Dep("com.lihaoyi", "acyclic", "0.1.7")) + def repositories = super.repositories ++ Seq( + MavenRepository("https://oss.sonatype.org/content/repositories/releases") + ) + def testArgs = T{ Seq.empty[String] } object test extends this.Tests{ @@ -45,7 +50,7 @@ object Core extends MillModule { def ivyDeps = Seq( Dep("com.lihaoyi", "sourcecode", "0.1.4"), Dep("com.lihaoyi", "pprint", "0.5.3"), - Dep.Point("com.lihaoyi", "ammonite", "1.0.3"), + Dep.Point("com.lihaoyi", "ammonite", "1.0.3-9-b0b068a"), Dep("com.typesafe.play", "play-json", "2.6.6"), Dep("org.scala-sbt", "zinc", "1.0.5"), Dep.Java("org.scala-sbt", "test-interface", "1.0") diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala index 600b4817..6289811a 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala +++ b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala @@ -68,7 +68,7 @@ trait ScalaModule extends Module with TaskModule{ outer => def scalacOptions = T{ Seq.empty[String] } def javacOptions = T{ Seq.empty[String] } - val repositories: Seq[Repository] = Seq( + def repositories: Seq[Repository] = Seq( Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2") ) @@ -233,4 +233,4 @@ trait SbtScalaModule extends ScalaModule { outer => override def sources = T.source{ basePath / 'src / 'test / 'scala } override def resources = T.source{ basePath / 'src / 'test / 'resources } } -}
\ No newline at end of file +} |