Skip to content

Commit 37c4a24

Browse files
Merge pull request #37 from 47deg/upgrades-sbt-catalyst-extras-plugin
Upgrades sbt catalyst extras plugin
2 parents f6b99e2 + ed9db3c commit 37c4a24

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

build.sbt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
import de.heikoseeberger.sbtheader.license.MIT
22
import catext.Dependencies._
3+
import PgpKeys.gpgCommand
34

45
val dev = Seq(Dev("47 Degrees (twitter: @47deg)", "47 Degrees"))
56
val gh = GitHubSettings("com.fortysevendeg", "github4s", "47 Degrees", mit)
67
val vAll = Versions(versions, libraries, scalacPlugins)
78

9+
pgpPassphrase := Some(sys.env.getOrElse("PGP_PASSPHRASE", "").toCharArray)
10+
pgpPublicRing := file(s"${sys.env.getOrElse("PGP_FOLDER", ".")}/pubring.gpg")
11+
pgpSecretRing := file(s"${sys.env.getOrElse("PGP_FOLDER", ".")}/secring.gpg")
12+
813
lazy val buildSettings = Seq(
914
name := gh.proj,
1015
organization := gh.org,
@@ -19,8 +24,8 @@ lazy val buildSettings = Seq(
1924
"scala" -> MIT("2016", "47 Degrees, LLC. <http://www.47deg.com>")
2025
)
2126
) ++ reformatOnCompileSettings ++
27+
miscSettings ++
2228
sharedReleaseProcess ++
23-
pgpSettings ++
2429
credentialSettings ++
2530
sharedPublishSettings(gh, dev)
2631

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("com.fortysevendeg" % "sbt-catalysts-extras" % "0.0.3")
1+
addSbtPlugin("com.fortysevendeg" % "sbt-catalysts-extras" % "0.0.4")
22
addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.4.7")
33
addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.2.6")

0 commit comments

Comments
 (0)