From 0bbeea39777ac6ca5f5cc5943e1cbf50f58c0a27 Mon Sep 17 00:00:00 2001
From: Johannes Rudolph <johannes.rudolph@gmail.com>
Date: Mon, 23 Oct 2017 16:19:47 +0200
Subject: [PATCH] Modernize and adapt build, update to newest versions

---
 build.sbt             | 28 ++++++++++------------------
 project/Helpers.scala | 16 ----------------
 project/pgp.sbt       |  2 +-
 publish.sbt           | 27 ++++++++++++++++++++-------
 4 files changed, 31 insertions(+), 42 deletions(-)
 delete mode 100644 project/Helpers.scala

diff --git a/build.sbt b/build.sbt
index 15c1afcb6..411b401b2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,7 +9,8 @@ libraryDependencies ++= {
     Nil
 }
 
-libraryDependencies += "org.specs2" %% "specs2-core" % "3.9.1" % "test"
+
+libraryDependencies += "org.specs2" %% "specs2-core" % "3.9.5" % Test
 
 libraryDependencies += Defaults.sbtPluginExtra(
   "com.dwijnand" % "sbt-compat" % "1.1.0",
@@ -17,22 +18,13 @@ libraryDependencies += Defaults.sbtPluginExtra(
   (scalaBinaryVersion in update).value
 )
 
-scalacOptions ++= Seq("-deprecation", "-unchecked")
+crossSbtVersions := Seq("1.0.2", "0.13.16")
 
-ScalariformSupport.formatSettings
+scalacOptions ++= Seq(
+  "-deprecation",
+  "-encoding", "UTF-8",
+  "-feature",
+  "-unchecked"
+)
 
-crossSbtVersions := Seq("1.0.1", "0.13.16")
-
-//sbtVersion in pluginCrossBuild := "1.0.0"
-
-/*
-Try to prevent silly warnings
-
-libraryDependencies += ("org.scala-sbt" %% "main-settings" % "1.0.1-SNAPSHOT")//.excludeAll(ExclusionRule(organization = "org.scala-sbt"))
-
-libraryDependencies += "org.scala-sbt" %% "command" % "1.0.0"force()
-libraryDependencies += "org.scala-sbt" %% "completion" % "1.0.0"force()
-libraryDependencies += "org.scala-sbt" %% "task-system" % "1.0.0"force()
-libraryDependencies += "org.scala-sbt" %% "core-macros" % "1.0.0" force()
-
-*/
\ No newline at end of file
+ScalariformSupport.formatSettings
\ No newline at end of file
diff --git a/project/Helpers.scala b/project/Helpers.scala
deleted file mode 100644
index 4c426be62..000000000
--- a/project/Helpers.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-import java.net.URL
-
-object Helpers {
-  def generatePomExtra(scmUrl: String, scmConnection: String,
-                       developerId: String, developerName: String): xml.NodeSeq =
-    <scm>
-      <url>{ scmUrl }</url>
-      <connection>{ scmConnection }</connection>
-    </scm>
-    <developers>
-      <developer>
-        <id>{ developerId }</id>
-        <name>{ developerName }</name>
-      </developer>
-    </developers>
-}
\ No newline at end of file
diff --git a/project/pgp.sbt b/project/pgp.sbt
index cefa8ec57..2efcc4b69 100644
--- a/project/pgp.sbt
+++ b/project/pgp.sbt
@@ -1 +1 @@
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
diff --git a/publish.sbt b/publish.sbt
index 9d44a4f3a..a8a28600c 100644
--- a/publish.sbt
+++ b/publish.sbt
@@ -1,7 +1,9 @@
-publishTo <<= version { v: String =>
+publishTo := {
   val nexus = "https://oss.sonatype.org/"
-  if (v.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
-  else                             Some("releases" at nexus + "service/local/staging/deploy/maven2")
+  Some {
+    if (version.value.trim.endsWith("SNAPSHOT")) "snapshots" at nexus + "content/repositories/snapshots"
+    else                                         "releases"  at nexus + "service/local/staging/deploy/maven2"
+  }
 }
 
 publishMavenStyle := true
@@ -10,9 +12,20 @@ publishArtifact in Test := false
 
 pomIncludeRepository := { _ => false }
 
-pomExtra :=
-  Helpers.generatePomExtra("git@github.com:jrudolph/sbt-dependency-graph.git",
-                           "scm:git:git@github.com:jrudolph/sbt-dependency-graph.git",
-                           "jrudolph", "Johannes Rudolph")
+scmInfo := Some(
+  ScmInfo(
+    browseUrl = url("https://github.com/jrudolph/sbt-dependency-graph"),
+    connection = "scm:git:git@github.com:jrudolph/sbt-dependency-graph.git"
+  )
+)
+
+developers := List(
+  Developer(
+    "jrudolph",
+    "Johannes Rudolph",
+    "johannes.rudolph@gmail.com",
+    url("https://virtual-void.net")
+  )
+)
 
 useGpg := true