summaryrefslogtreecommitdiff
path: root/scalaplugin/src/main
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-11-26 11:21:19 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-11-26 11:21:19 -0800
commit7bd320dcd9a1bfc59a80bc8237d293ee44b28f77 (patch)
treefa7a120465303f6dc4d625951a3ea87237cee75a /scalaplugin/src/main
parentb7ec589b0974d7cbba18deb59898c16d7e0971bc (diff)
parent9262462b0aad28efa37696a857b6ca0f9b246f85 (diff)
downloadmill-7bd320dcd9a1bfc59a80bc8237d293ee44b28f77.tar.gz
mill-7bd320dcd9a1bfc59a80bc8237d293ee44b28f77.tar.bz2
mill-7bd320dcd9a1bfc59a80bc8237d293ee44b28f77.zip
Merge branch 'master' of github.com:lihaoyi/mill
Diffstat (limited to 'scalaplugin/src/main')
-rw-r--r--scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala4
1 files changed, 2 insertions, 2 deletions
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)