diff options
author | Nikolay Tatarinov <5min4eq.unity@gmail.com> | 2017-11-26 21:55:47 +0300 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2017-11-26 10:55:47 -0800 |
commit | 9262462b0aad28efa37696a857b6ca0f9b246f85 (patch) | |
tree | 47036dcc406faf196f14b7abf7a7e2b4fba15dc0 | |
parent | 1c1abf19b34bc6a467c25b8838f7816694d423d1 (diff) | |
download | mill-9262462b0aad28efa37696a857b6ca0f9b246f85.tar.gz mill-9262462b0aad28efa37696a857b6ca0f9b246f85.tar.bz2 mill-9262462b0aad28efa37696a857b6ca0f9b246f85.zip |
upgrade zinc 1.0.3 -> 1.0.5 (#26)
-rw-r--r-- | build.sbt | 4 | ||||
-rwxr-xr-x | build.sc | 4 | ||||
-rw-r--r-- | scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -44,7 +44,7 @@ lazy val core = project "com.lihaoyi" %% "sourcecode" % "0.1.4", "com.lihaoyi" %% "pprint" % "0.5.3", "com.lihaoyi" % "ammonite" % "1.0.3" cross CrossVersion.full, - "org.scala-sbt" %% "zinc" % "1.0.3", + "org.scala-sbt" %% "zinc" % "1.0.5", "org.scala-sbt" % "test-interface" % "1.0" ) ) @@ -54,4 +54,4 @@ lazy val scalaplugin = project .settings( sharedSettings, name := "mill-scalaplugin" - )
\ No newline at end of file + ) @@ -23,7 +23,7 @@ object Core extends MillModule { Dep("com.lihaoyi", "pprint", "0.5.3"), Dep.Point("com.lihaoyi", "ammonite", "1.0.3"), Dep("com.typesafe.play", "play-json", "2.6.6"), - Dep("org.scala-sbt", "zinc", "1.0.3"), + Dep("org.scala-sbt", "zinc", "1.0.5"), Dep.Java("org.scala-sbt", "test-interface", "1.0") ) @@ -52,4 +52,4 @@ object ScalaPlugin extends MillModule { override def prependShellScript = "#!/usr/bin/env sh\n" + "exec java -cp \"$0\" mill.scalaplugin.Main \"$@\"" -}
\ No newline at end of file +} diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala index f42a3055..53c98be1 100644 --- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala +++ b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala @@ -52,7 +52,7 @@ object ScalaModule{ ) val scalac = ZincUtil.scalaCompiler( scalaInstance, - grepJar(s"compiler-bridge_$binaryScalaVersion-1.0.3.jar") + grepJar(s"compiler-bridge_$binaryScalaVersion-1.0.5.jar") ) mkdir(outputPath) @@ -150,7 +150,7 @@ object ScalaModule{ } def scalaCompilerIvyDeps(scalaVersion: String) = Seq( Dep.Java("org.scala-lang", "scala-compiler", scalaVersion), - Dep("org.scala-sbt", s"compiler-bridge", "1.0.3") + Dep("org.scala-sbt", "compiler-bridge", "1.0.5") ) def scalaRuntimeIvyDeps(scalaVersion: String) = Seq[Dep]( Dep.Java("org.scala-lang", "scala-library", scalaVersion) |