diff --git a/.gitignore b/.gitignore index 24cfa219..7e5b3324 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ target/ _site/* docs/src/jekyll/_site/ docs/src/jekyll/*.md -/secring.gpg +secret_key.asc .sass-cache .DS_Store diff --git a/.scalafmt.conf b/.scalafmt.conf index 81701fdd..48617446 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,5 @@ +version = 2.4.2 + style = defaultWithAlign maxColumn = 100 diff --git a/.travis.yml b/.travis.yml index f32169e5..080efae7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/build.sbt b/build.sbt index 221d5ac1..3e11899f 100644 --- a/build.sbt +++ b/build.sbt @@ -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") diff --git a/project/plugins.sbt b/project/plugins.sbt index a21d7352..c5bb0039 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") diff --git a/pubring.gpg b/pubring.gpg deleted file mode 100644 index 253f09dc..00000000 --- a/pubring.gpg +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: BCPG v1.51 - -mQENBFgh9PIBCACUy6nU/56bEfQVyTdlXnenXZPeRv3PzMVgOwLIVB39Lpwyl5Ld -TF3aU4EHwFD5fy0W8mImCgLRn2cJmYauukS1kSXoKldixThvwmzISTodBfjirNdq -mHxgTrOJQAx0IQWKZHcuLb0kafc9fp/gbfUaP3fjgy1SiIIwAuIxVVKvHWn3eh/S -PkkTEWHtTLh+9GvMtiTTYekoMSFBvDGw1hptXM/+CCnvXMSc//YCAkyK+hZx+fjg -dJoullPNsfPgymsX1v4m3R2XaqiXVCSe5X8PQcZ96SlDIIoMPVPC9X7lJkrym2Km -zH7v0j2a6LR8gzTPzJWgW1AxYqm7T/1XtblRABEBAAG0ITQ3ZGVnL2ZldGNoIDxk -ZXZlbG9wZXJANDdkZWcuY29tPokBHAQTAQIABgUCWCH08gAKCRBWrGKFsjaSVUb7 -B/9fj95K7DNl7bIJGvjFcMM/vlAk/TSrPiARSnJ9Ehj7Yl7PewSsWw0TXTX6XCN7 -bWr2tt64tSUy7sQxYe3FKpOfHRdIwIoOn30dkCyv3cDlKz5npt1q/PjdQpPwSPsN -pVux86eQr2GwuYW5ZrXcM9Hv2xjWKmNxDN/PklvVAYp1hFq5LO+3G5CYChkKH8C9 -UIQngIqb5tfXf6kF66PhogHT06e9bk+XxoBOK/BIoxhl9C+EfY0YLjh8Z9wVaO+O -Q76KHjHRGGwuVvko76mD5JrWt/VRsfvAREIYUu1I1anWZ+ZAPjAy8RXBBrClTSV/ -tJ7Q1ynYVTfa9mwdDyMNvnET -=QCgm ------END PGP PUBLIC KEY BLOCK----- diff --git a/secring.gpg.enc b/secret_key.asc.enc similarity index 100% rename from secring.gpg.enc rename to secret_key.asc.enc