some updates for changes to sbt-pgp

longevityframework · Oct 25, 2017 · dc8f07e · dc8f07e
1 parent 88d6fcc
commit dc8f07e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 33 deletions.
diff --git a/build.sbt b/build.sbt
@@ -34,9 +34,6 @@ lazy val longevity = project.in(file("longevity"))
     libraryDependencies += Dependencies.scalaTestDep    % "optional,test",
     libraryDependencies += Dependencies.sqliteDep       % "optional,test",
 
-    homepage := BuildSettings.longevityHomepage,
-    pomExtra := BuildSettings.longevityPomExtra,
-
     addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
     addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.4"))
   .enablePlugins(JekyllPlugin, SiteScaladocPlugin, GhpagesPlugin)
@@ -50,27 +47,21 @@ lazy val longevityCassandraDeps = Project("longevity-cassandra-deps", file("long
   .settings(BuildSettings.publishSettings)
   .settings(
     libraryDependencies += Dependencies.cassandraDep,
-    libraryDependencies += Dependencies.json4sDep,
-    homepage := BuildSettings.longevityHomepage,
-    pomExtra := BuildSettings.longevityPomExtra)
+    libraryDependencies += Dependencies.json4sDep)
 
 lazy val longevityMongoDbDeps = Project("longevity-mongodb-deps", file("longevity-mongodb-deps"))
   .settings(BuildSettings.publishSettings)
   .settings(
-    libraryDependencies += Dependencies.mongodbDep,
-    homepage := BuildSettings.longevityHomepage,
-    pomExtra := BuildSettings.longevityPomExtra)
+    libraryDependencies += Dependencies.mongodbDep)
 
 lazy val longevitySqliteDeps = Project("longevity-sqlite-deps", file("longevity-sqlite-deps"))
   .settings(BuildSettings.publishSettings)
   .settings(
     libraryDependencies += Dependencies.sqliteDep,
-    libraryDependencies += Dependencies.json4sDep,
-    homepage := BuildSettings.longevityHomepage,
-    pomExtra := BuildSettings.longevityPomExtra)
+    libraryDependencies += Dependencies.json4sDep)
 
 lazy val longevityMigrations = Project("longevity-migrations", file("longevity-migrations"))
-  .settings(BuildSettings.buildSettings: _*)
+  .settings(BuildSettings.buildSettings)
   .settings(
     libraryDependencies += Dependencies.catsDep,
     libraryDependencies += Dependencies.catsIterateeDep,
@@ -80,8 +71,6 @@ lazy val longevityMigrations = Project("longevity-migrations", file("longevity-m
     libraryDependencies += Dependencies.mongodbDep     % "test",
     libraryDependencies += Dependencies.slf4jSimpleDep % "test",
     libraryDependencies += Dependencies.sqliteDep      % "test",
-    homepage := BuildSettings.longevityHomepage,
-    pomExtra := BuildSettings.longevityPomExtra,
     addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
     addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.4"))
   .dependsOn(longevity)
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -20,9 +20,16 @@ object BuildSettings {
       else
         Some("releases" at nexus + "service/local/staging/deploy/maven2")
     },
-    licenses := Seq("Apache License, Version 2.0" ->
-                    url("http://www.apache.org/licenses/LICENSE-2.0"))
-  )
+    licenses := Seq("Apache License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
+    homepage := Some(url("http://longevityframework.org/")),
+    scmInfo  := Some(ScmInfo(
+      url("https://github.com/longevityframework/longevity.git"),
+      "scm:git:git@github.com:longevityframework/longevity.git")),
+    developers := List(Developer(
+      id    = "sullivan-",
+      name  = "John Sullivan",
+      email = "John Sullivan MSCS at gmail",
+      url   = url("https://github.com/sullivan-"))))
 
   val buildSettings = publishSettings ++ Seq(
     scalacOptions ++= compileScalacOptions,
@@ -64,21 +71,6 @@ object BuildSettings {
     publish := ((): Unit),
     publishSigned := ((): Unit))
 
-  def longevityHomepage = Some(url("http://longevityframework.org/"))
-
-  def longevityPomExtra = (
-    <scm>
-      <url>git@github.com:longevityframework/longevity.git</url>
-      <connection>scm:git:git@github.com:longevityframework/longevity.git</connection>
-    </scm>
-    <developers>
-      <developer>
-        <id>sullivan-</id>
-        <name>John Sullivan</name>
-        <url>https://github.com/sullivan-</url>
-      </developer>
-    </developers>)
-
   private def githubUrl = "https://github.com/longevityframework/longevity"
 
   private def compileScalacOptions = Seq(