Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sbt-microsites to 1.1.4 #257

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ target/
_site/*
docs/src/jekyll/_site/
docs/src/jekyll/*.md
/secring.gpg
secret_key.asc
.sass-cache
.DS_Store

2 changes: 2 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
version = 2.4.2

style = defaultWithAlign
maxColumn = 100

Expand Down
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ jdk:
- openjdk8

before_install:
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc
-K $encrypted_37b99bd39158_key -iv $encrypted_37b99bd39158_iv
-in secring.gpg.enc -out secring.gpg -d; fi
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
openssl aes-256-cbc -K $encrypted_37b99bd39158_key -iv $encrypted_37b99bd39158_iv -in secret_key.asc.enc -out secret_key.asc -d;
gpg --import --batch --passphrase "$PGP_PASSPHRASE" secret_key.asc;
fi
- export PATH=${PATH}:./vendor/bundle

install:
Expand Down
2 changes: 0 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject}
import sbtorgpolicies.model.GitHubSettings

pgpPassphrase := Some(getEnvVar("PGP_PASSPHRASE").getOrElse("").toCharArray)
pgpPublicRing := file(s"$gpgFolder/pubring.gpg")
pgpSecretRing := file(s"$gpgFolder/secring.gpg")

addCommandAlias("makeDocs", ";docs/makeMicrosite")

Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resolvers += Resolver.sonatypeRepo("releases")
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.12.0-M3")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.1.3")
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.13.3")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.1.4")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
18 changes: 0 additions & 18 deletions pubring.gpg

This file was deleted.

File renamed without changes.