diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2015-11-09 10:03:37 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2015-11-09 10:03:37 +0100 |
| commit | 8c593779fd49f9085f69b6b5a9fe180ebede801e (patch) | |
| tree | a5733bd3a20389d0c9cc0948748bfd9c75357c78 | |
| parent | b3a1626d81385624f1db894a360288b85e8b3585 (diff) | |
| parent | 9a53392f551ce97c2490ca8f38bc3dac7cfa1a08 (diff) | |
| download | dotty-8c593779fd49f9085f69b6b5a9fe180ebede801e.tar.gz dotty-8c593779fd49f9085f69b6b5a9fe180ebede801e.tar.bz2 dotty-8c593779fd49f9085f69b6b5a9fe180ebede801e.zip | |
Merge pull request #867 from dotty-staging/upgrade/sbt-0.13.9
Upgrade SBT to 0.13.9
| -rw-r--r-- | project/Build.scala | 4 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/project/Build.scala b/project/Build.scala index 442ac3c2f..7272ef0dd 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -17,7 +17,7 @@ object DottyBuild extends Build { // "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1g", "-Xss2m" ) - val defaults = Defaults.defaultSettings ++ Seq( + val defaults = Defaults.coreDefaultSettings ++ Seq( scalaVersion in Global := "2.11.5", version in Global := "0.1-SNAPSHOT", organization in Global := "org.scala-lang", @@ -123,7 +123,7 @@ object DottyBuild extends Build { lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults) - lazy val benchmarkSettings = Defaults.defaultSettings ++ Seq( + lazy val benchmarkSettings = Defaults.coreDefaultSettings ++ Seq( // to get Scala 2.11 resolvers += Resolver.sonatypeRepo("releases"), diff --git a/project/build.properties b/project/build.properties index be6c454fb..817bc38df 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.5 +sbt.version=0.13.9 diff --git a/project/plugins.sbt b/project/plugins.sbt index 47bc44dfe..3a94c4362 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,9 @@ // e.g. addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0") // Scala IDE project file generator -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0") - -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.6.0") +addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0") +// See https://github.com/scalastyle/scalastyle/issues/156#issuecomment-137229733 +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.7.0" excludeAll( + ExclusionRule(organization = "com.danieltrinh"))) +libraryDependencies += "org.scalariform" %% "scalariform" % "0.1.7" |