diff options
author | Dmitry Petrashko <dark@d-d.me> | 2016-02-28 19:16:35 +0100 |
---|---|---|
committer | Dmitry Petrashko <dark@d-d.me> | 2016-02-28 19:16:35 +0100 |
commit | c2cb4694556731aaa243889d702afb5ac2b9e74a (patch) | |
tree | ce214443f446c6a0ef0fef8d13120a68afdce3ff /project | |
parent | 0eecb7189188e6ce379b8840749abb1e0241035b (diff) | |
parent | 327960efa53d67ee0c56729a0e4e655423cde26b (diff) | |
download | dotty-c2cb4694556731aaa243889d702afb5ac2b9e74a.tar.gz dotty-c2cb4694556731aaa243889d702afb5ac2b9e74a.tar.bz2 dotty-c2cb4694556731aaa243889d702afb5ac2b9e74a.zip |
Merge pull request #1127 from dotty-staging/upgrade/sbt-0.13.11
Upgrade sbt to 0.13.11 and scalastyle-sbt-plugin to 0.8.0
Diffstat (limited to 'project')
-rw-r--r-- | project/build.properties | 2 | ||||
-rw-r--r-- | project/plugins.sbt | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/project/build.properties b/project/build.properties index 817bc38df..43b8278c6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.9 +sbt.version=0.13.11 diff --git a/project/plugins.sbt b/project/plugins.sbt index de44b41f0..f9c0dbf1a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,8 +5,4 @@ // Scala IDE project file generator 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" +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") |