diff --git a/build.sbt b/build.sbt index 7401e1f27..e3db9eed3 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,3 @@ -seq(lsSettings :_*) - crossBuildingSettings CrossBuilding.crossSbtVersions := Seq("0.11.1", "0.11.2", "0.11.3", "0.12", "0.13") @@ -15,7 +13,7 @@ libraryDependencies <++= scalaVersion { version => libraryDependencies <+= scalaVersion { version => if (version startsWith "2.9") "org.specs2" % "specs2_2.9.3" % "1.12.4.1" % "test" - else "org.specs2" %% "specs2" % "2.1.1" % "test" + else "org.specs2" %% "specs2" % "2.3.11" % "test" } scalacOptions ++= Seq("-deprecation", "-unchecked") diff --git a/project.sbt b/project.sbt index 9d5e2e7ca..6320ebf46 100644 --- a/project.sbt +++ b/project.sbt @@ -9,10 +9,3 @@ version := "0.7.5-SNAPSHOT" homepage := Some(url("http://github.com/jrudolph/sbt-dependency-graph")) licenses in GlobalScope += "Apache License 2.0" -> url("https://github.com/jrudolph/sbt-dependency-graph/raw/master/LICENSE") - -(LsKeys.tags in LsKeys.lsync) := Seq("dependency", "graph", "sbt-plugin", "sbt") - -(LsKeys.docsUrl in LsKeys.lsync) <<= homepage - -(description in LsKeys.lsync) := - "An sbt plugin to visualize dependencies of your build." diff --git a/project/ScalariformSupport.scala b/project/ScalariformSupport.scala new file mode 100644 index 000000000..665a9e6fe --- /dev/null +++ b/project/ScalariformSupport.scala @@ -0,0 +1,20 @@ +import sbt._ + +import com.typesafe.sbt.SbtScalariform +import com.typesafe.sbt.SbtScalariform.ScalariformKeys + +object ScalariformSupport { + lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq( + ScalariformKeys.preferences in Compile := formattingPreferences, + ScalariformKeys.preferences in Test := formattingPreferences + ) + + import scalariform.formatter.preferences._ + def formattingPreferences = + FormattingPreferences() + .setPreference(RewriteArrowSymbols, true) + .setPreference(AlignParameters, true) + .setPreference(AlignSingleLineCaseStatements, true) + .setPreference(DoubleIndentClassDeclaration, true) + +} diff --git a/project/build.properties b/project/build.properties index 5e96e9672..748703f77 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.4 +sbt.version=0.13.7 diff --git a/project/gpg.sbt b/project/gpg.sbt deleted file mode 100644 index d78507cdd..000000000 --- a/project/gpg.sbt +++ /dev/null @@ -1,3 +0,0 @@ -resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns) - -addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6") \ No newline at end of file diff --git a/project/pgp.sbt b/project/pgp.sbt new file mode 100644 index 000000000..4ce4d9ed4 --- /dev/null +++ b/project/pgp.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") diff --git a/project/plugins.sbt b/project/plugins.sbt index fe876fa09..df57f0cef 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,3 @@ -resolvers += "less is" at "http://repo.lessis.me" +addSbtPlugin("net.virtual-void" % "sbt-cross-building" % "0.8.1") -addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.2") - -resolvers += "Coda Hale's Repo" at "http://repo.codahale.com" - -addSbtPlugin("net.virtual-void" % "sbt-cross-building" % "0.8.0-RC1") +addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1") \ No newline at end of file