From 54ec27ec2ad170d91c88ea4456975f55153b5c5a Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 27 Sep 2013 13:26:22 -0400 Subject: [PATCH] Port to sbt 0.13.0 --- config/build.sbt | 9 +++++++-- project/build.properties | 2 +- project/plugins.sbt | 12 ++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/config/build.sbt b/config/build.sbt index 4c4df394..9bbfa729 100644 --- a/config/build.sbt +++ b/config/build.sbt @@ -1,5 +1,6 @@ import de.johoop.findbugs4sbt.FindBugs._ import de.johoop.findbugs4sbt.ReportType +import de.johoop.findbugs4sbt.Effort import de.johoop.jacoco4sbt._ import JacocoPlugin._ @@ -21,9 +22,13 @@ externalResolvers += "Scala Tools Snapshots" at "http://scala-tools.org/repo-sna seq(findbugsSettings : _*) -findbugsReportType := ReportType.Html +findbugsReportType := Some(ReportType.Html) -findbugsReportName := "findbugs.html" +findbugsReportName := Some("findbugs.html") + +findbugsEffort := Effort.High + +findbugsMaxMemory := 1000 seq(jacoco.settings : _*) diff --git a/project/build.properties b/project/build.properties index 9b860e23..0974fce4 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.3 +sbt.version=0.13.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index fb95ffd5..8376774f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,11 +1,7 @@ -addSbtPlugin("de.johoop" % "findbugs4sbt" % "1.1.7") +addSbtPlugin("de.johoop" % "findbugs4sbt" % "1.2.1") -libraryDependencies ++= Seq( - "org.jacoco" % "org.jacoco.core" % "0.5.9.201207300726" artifacts(Artifact("org.jacoco.core", "jar", "jar")), - "org.jacoco" % "org.jacoco.report" % "0.5.9.201207300726" artifacts(Artifact("org.jacoco.report", "jar", "jar"))) +addSbtPlugin("de.johoop" % "jacoco4sbt" % "2.1.1") -addSbtPlugin("de.johoop" % "jacoco4sbt" % "1.2.4") +addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1") -addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.7") - -addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.4.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.6.0")