Skip to content

Commit 8c59377

Browse files
committed
Merge pull request #867 from dotty-staging/upgrade/sbt-0.13.9
Upgrade SBT to 0.13.9
2 parents b3a1626 + 9a53392 commit 8c59377

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

project/Build.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object DottyBuild extends Build {
1717
// "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1g", "-Xss2m"
1818
)
1919

20-
val defaults = Defaults.defaultSettings ++ Seq(
20+
val defaults = Defaults.coreDefaultSettings ++ Seq(
2121
scalaVersion in Global := "2.11.5",
2222
version in Global := "0.1-SNAPSHOT",
2323
organization in Global := "org.scala-lang",
@@ -123,7 +123,7 @@ object DottyBuild extends Build {
123123

124124
lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults)
125125

126-
lazy val benchmarkSettings = Defaults.defaultSettings ++ Seq(
126+
lazy val benchmarkSettings = Defaults.coreDefaultSettings ++ Seq(
127127

128128
// to get Scala 2.11
129129
resolvers += Resolver.sonatypeRepo("releases"),

project/build.properties

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

project/plugins.sbt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
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" % "2.2.0")
7-
8-
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.6.0")
6+
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
97

8+
// See https://github.com/scalastyle/scalastyle/issues/156#issuecomment-137229733
9+
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.7.0" excludeAll(
10+
ExclusionRule(organization = "com.danieltrinh")))
11+
libraryDependencies += "org.scalariform" %% "scalariform" % "0.1.7"

0 commit comments

Comments
 (0)