Merge branch 'main' into update/sbt-pgp-2.2.1

sbt · Mar 11, 2023 · 8fc8d33 · 8fc8d33
2 parents aee7dbf + 8c50b77
commit 8fc8d33
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,6 +6,6 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3.0.2
-    - uses: olafurpg/setup-scala@v13
+    - uses: actions/checkout@v3
+    - uses: olafurpg/setup-scala@v14
     - run: sbt compile
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,10 +7,10 @@ jobs:
   publish:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: olafurpg/setup-scala@v13
+      - uses: olafurpg/setup-scala@v14
       - run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

diff --git a/build.sbt b/build.sbt
@@ -27,6 +27,6 @@ lazy val plugin = project
     pluginCrossBuild / sbtVersion := "1.0.4",
     addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1"),
     addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0"),
-    addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13"),
-    addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
+    addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.18"),
+    addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1"),
   )
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,6 +2,6 @@ unmanagedSourceDirectories.in(Compile) +=
   baseDirectory.in(ThisBuild).value.getParentFile /
     "plugin" / "src" / "main" / "scala"
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.18")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
 addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0")
diff --git a/readme.md b/readme.md
@@ -126,7 +126,7 @@ If your sonatype account is new (created after Feb 2021), then the default serve
 location inherited from the the `sbt-sonatype` plugin will not work, and you should
 also include the following overrides in your publishing settings
 ```scala
-sonatypeCredentialHost := "s01.oss.sonatype.org"
+ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org"
 sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
 ```
 
@@ -186,6 +186,23 @@ and post the signature to a keyserver: https://keyserver.ubuntu.com/
 
 ![Ubuntu Keyserver](https://i.imgur.com/njvOpmq.png)
 
+or run:
+
+```bash
+# macOS
+gpg --keyserver hkp://keyserver.ubuntu.com --send-key $LONG_ID && \
+ gpg --keyserver hkp://pgp.mit.edu --send-key $LONG_ID && \
+ gpg --keyserver hkp://pool.sks-keyservers.net --send-key $LONG_ID
+# linux
+gpg --keyserver hkp://keyserver.ubuntu.com --send-key $LONG_ID && \
+ gpg --keyserver hkp://pgp.mit.edu --send-key $LONG_ID && \
+ gpg --keyserver hkp://pool.sks-keyservers.net --send-key $LONG_ID
+# Windows
+gpg --keyserver hkp://keyserver.ubuntu.com --send-key %LONG_ID% && \
+ gpg --keyserver hkp://pgp.mit.edu --send-key %LONG_ID% && \
+ gpg --keyserver hkp://pool.sks-keyservers.net --send-key %LONG_ID%
+```
+
 ## Secrets
 
 Next, you'll need to declare four environment variables in your CI. Open the