Skip to content

Commit 5c20e2e

Browse files
committed
Update dependencies and plugins version
1 parent e55fe0e commit 5c20e2e

File tree

5 files changed

+33
-17
lines changed

5 files changed

+33
-17
lines changed

project/Build.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,9 @@ object Build {
498498
// get libraries onboard
499499
libraryDependencies ++= Seq(
500500
"org.scala-lang.modules" % "scala-asm" % "6.0.0-scala-1", // used by the backend
501-
"com.typesafe.sbt" % "sbt-interface" % sbtVersion.value,
502501
("org.scala-lang.modules" %% "scala-xml" % "1.0.6").withDottyCompat(scalaVersion.value),
503-
"org.scala-lang" % "scala-library" % scalacVersion % "test"
502+
"org.scala-lang" % "scala-library" % scalacVersion % "test",
503+
Dependencies.`compiler-interface`,
504504
),
505505

506506
// For convenience, change the baseDirectory when running the compiler
@@ -699,7 +699,7 @@ object Build {
699699
packageAll := {
700700
(packageAll in `dotty-compiler`).value ++ Seq(
701701
("dotty-compiler" -> (packageBin in Compile).value.getAbsolutePath),
702-
("dotty-library" -> (packageBin in (dottyLibrary(Bootstrapped), Compile)).value.getAbsolutePath)
702+
("dotty-library" -> (packageBin in (`dotty-library-bootstrapped`, Compile)).value.getAbsolutePath)
703703
)
704704
}
705705
)
@@ -750,10 +750,10 @@ object Build {
750750
description := "sbt compiler bridge for Dotty",
751751
resolvers += Resolver.typesafeIvyRepo("releases"), // For org.scala-sbt:api
752752
libraryDependencies ++= Seq(
753-
"org.scala-sbt" % "compiler-interface" % "1.0.2",
754-
("org.scala-sbt" %% "zinc-apiinfo" % "1.0.2" % "test").withDottyCompat(scalaVersion.value),
755-
("org.specs2" %% "specs2-core" % "3.9.1" % "test").withDottyCompat(scalaVersion.value),
756-
("org.specs2" %% "specs2-junit" % "3.9.1" % "test").withDottyCompat(scalaVersion.value)
753+
Dependencies.`compiler-interface`,
754+
(Dependencies.`zinc-apiinfo` % Test).withDottyCompat(scalaVersion.value),
755+
("org.specs2" %% "specs2-core" % "3.9.1" % Test).withDottyCompat(scalaVersion.value),
756+
("org.specs2" %% "specs2-junit" % "3.9.1" % Test).withDottyCompat(scalaVersion.value)
757757
),
758758
// The sources should be published with crossPaths := false since they
759759
// need to be compiled by the project using the bridge.
@@ -882,11 +882,10 @@ object Build {
882882
lazy val `sbt-dotty` = project.in(file("sbt-dotty")).
883883
settings(commonSettings).
884884
settings(
885-
scalaVersion := "2.12.2",
886885
// Keep in sync with inject-sbt-dotty.sbt
887886
libraryDependencies ++= Seq(
888887
Dependencies.`jackson-databind`,
889-
"org.scala-sbt" % "compiler-interface" % "1.0.2"
888+
Dependencies.`compiler-interface`
890889
),
891890
unmanagedSourceDirectories in Compile +=
892891
baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config",
@@ -897,6 +896,7 @@ object Build {
897896
scriptedLaunchOpts += "-Dplugin.scalaVersion=" + dottyVersion,
898897
// By default scripted tests use $HOME/.ivy2 for the ivy cache. We need to override this value for the CI.
899898
scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList,
899+
scriptedBufferLog := false,
900900
scripted := scripted.dependsOn(Def.task {
901901
val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
902902
val x1 = (publishLocal in `dotty-interfaces`).value

project/Dependencies.scala

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import java.io.FileInputStream;
2+
import java.util.Properties
3+
14
import sbt._
25

36
/** A dependency shared between multiple projects should be put here
@@ -9,4 +12,18 @@ object Dependencies {
912
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion
1013
val `jackson-dataformat-yaml` =
1114
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonVersion
12-
}
15+
16+
private def readPropertyFile(file: String): Properties = {
17+
val prop = new Properties()
18+
val input = new FileInputStream(file)
19+
try {
20+
prop.load(input)
21+
prop
22+
}
23+
finally input.close
24+
}
25+
26+
private val sbtVersion = readPropertyFile("project/build.properties").getProperty("sbt.version")
27+
val `compiler-interface` = "org.scala-sbt" % "compiler-interface" % sbtVersion
28+
val `zinc-apiinfo` = "org.scala-sbt" %% "zinc-apiinfo" % sbtVersion
29+
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.0.3
1+
sbt.version=1.1.0

project/inject-sbt-dotty.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-dotty/src
77
// Keep in sync with `sbt-dotty` config in Build.scala
88
libraryDependencies ++= Seq(
99
Dependencies.`jackson-databind`,
10-
"org.scala-sbt" % "compiler-interface" % "1.0.0-X16"
10+
Dependencies.`compiler-interface`
1111
)
1212
unmanagedSourceDirectories in Compile +=
1313
baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config"

project/plugins.sbt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@
33
// e.g. addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")
44

55
// Scala IDE project file generator
6-
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.3")
6+
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
77

88
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")
99

10-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
10+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
1111

12-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
12+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1")
1313

1414
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
1515

1616
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.10.1")
1717

18-
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
19-
18+
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.2")

0 commit comments

Comments
 (0)