Skip to content

Commit dc8f07e

Browse files
committed
some updates for changes to sbt-pgp
1 parent 88d6fcc commit dc8f07e

File tree

2 files changed

+14
-33
lines changed

2 files changed

+14
-33
lines changed

build.sbt

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ lazy val longevity = project.in(file("longevity"))
3434
libraryDependencies += Dependencies.scalaTestDep % "optional,test",
3535
libraryDependencies += Dependencies.sqliteDep % "optional,test",
3636

37-
homepage := BuildSettings.longevityHomepage,
38-
pomExtra := BuildSettings.longevityPomExtra,
39-
4037
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
4138
addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.4"))
4239
.enablePlugins(JekyllPlugin, SiteScaladocPlugin, GhpagesPlugin)
@@ -50,27 +47,21 @@ lazy val longevityCassandraDeps = Project("longevity-cassandra-deps", file("long
5047
.settings(BuildSettings.publishSettings)
5148
.settings(
5249
libraryDependencies += Dependencies.cassandraDep,
53-
libraryDependencies += Dependencies.json4sDep,
54-
homepage := BuildSettings.longevityHomepage,
55-
pomExtra := BuildSettings.longevityPomExtra)
50+
libraryDependencies += Dependencies.json4sDep)
5651

5752
lazy val longevityMongoDbDeps = Project("longevity-mongodb-deps", file("longevity-mongodb-deps"))
5853
.settings(BuildSettings.publishSettings)
5954
.settings(
60-
libraryDependencies += Dependencies.mongodbDep,
61-
homepage := BuildSettings.longevityHomepage,
62-
pomExtra := BuildSettings.longevityPomExtra)
55+
libraryDependencies += Dependencies.mongodbDep)
6356

6457
lazy val longevitySqliteDeps = Project("longevity-sqlite-deps", file("longevity-sqlite-deps"))
6558
.settings(BuildSettings.publishSettings)
6659
.settings(
6760
libraryDependencies += Dependencies.sqliteDep,
68-
libraryDependencies += Dependencies.json4sDep,
69-
homepage := BuildSettings.longevityHomepage,
70-
pomExtra := BuildSettings.longevityPomExtra)
61+
libraryDependencies += Dependencies.json4sDep)
7162

7263
lazy val longevityMigrations = Project("longevity-migrations", file("longevity-migrations"))
73-
.settings(BuildSettings.buildSettings: _*)
64+
.settings(BuildSettings.buildSettings)
7465
.settings(
7566
libraryDependencies += Dependencies.catsDep,
7667
libraryDependencies += Dependencies.catsIterateeDep,
@@ -80,8 +71,6 @@ lazy val longevityMigrations = Project("longevity-migrations", file("longevity-m
8071
libraryDependencies += Dependencies.mongodbDep % "test",
8172
libraryDependencies += Dependencies.slf4jSimpleDep % "test",
8273
libraryDependencies += Dependencies.sqliteDep % "test",
83-
homepage := BuildSettings.longevityHomepage,
84-
pomExtra := BuildSettings.longevityPomExtra,
8574
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
8675
addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.4"))
8776
.dependsOn(longevity)

project/BuildSettings.scala

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,16 @@ object BuildSettings {
2020
else
2121
Some("releases" at nexus + "service/local/staging/deploy/maven2")
2222
},
23-
licenses := Seq("Apache License, Version 2.0" ->
24-
url("http://www.apache.org/licenses/LICENSE-2.0"))
25-
)
23+
licenses := Seq("Apache License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
24+
homepage := Some(url("http://longevityframework.org/")),
25+
scmInfo := Some(ScmInfo(
26+
url("https://github.com/longevityframework/longevity.git"),
27+
"scm:git:[email protected]:longevityframework/longevity.git")),
28+
developers := List(Developer(
29+
id = "sullivan-",
30+
name = "John Sullivan",
31+
email = "John Sullivan MSCS at gmail",
32+
url = url("https://github.com/sullivan-"))))
2633

2734
val buildSettings = publishSettings ++ Seq(
2835
scalacOptions ++= compileScalacOptions,
@@ -64,21 +71,6 @@ object BuildSettings {
6471
publish := ((): Unit),
6572
publishSigned := ((): Unit))
6673

67-
def longevityHomepage = Some(url("http://longevityframework.org/"))
68-
69-
def longevityPomExtra = (
70-
<scm>
71-
<url>git@github.com:longevityframework/longevity.git</url>
72-
<connection>scm:git:git@github.com:longevityframework/longevity.git</connection>
73-
</scm>
74-
<developers>
75-
<developer>
76-
<id>sullivan-</id>
77-
<name>John Sullivan</name>
78-
<url>https://github.com/sullivan-</url>
79-
</developer>
80-
</developers>)
81-
8274
private def githubUrl = "https://github.com/longevityframework/longevity"
8375

8476
private def compileScalacOptions = Seq(

0 commit comments

Comments
 (0)