Final fixes

Signed-off-by: Antno Wilhelm <anton.wilhelm@here.com>

Author: devton-here

.github/scripts/deploy.sh

@@ -16,6 +16,4 @@ echo $GPG_PRIVATE_KEY | base64 -d > private.key
 gpg --import --batch private.key
 
 # Deploy to Maven Central
-sbt sonatypeDropAll
-sbt publishSigned
-sbt sonatypeCentralRelease
+sbt "publishSigned; sonaUpload; sonaRelease"

.github/workflows/release.yml

@@ -36,8 +36,8 @@ jobs:
       run: ./.github/scripts/push-tag.sh
     - name: Deploy
       env:
-        OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+        SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+        SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         GPG_PRIVATE_KEY: ${{ secrets.GPG_KEY }}
       run: ./.github/scripts/deploy.sh

.github/workflows/test.yml

@@ -29,7 +29,7 @@ jobs:
         distribution: 'adopt'
 
     - name: Cache SBT
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: |
           ~/.ivy2/cache

build.sbt

@@ -2,7 +2,6 @@ import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._
 import sbtrelease.Version
 import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
 import scala.xml.transform._
-import xerial.sbt.Sonatype.sonatypeCentralHost
 
 val organizationSettings: Seq[Setting[_]] = Seq(
   scalaVersion := "2.12.15",
@@ -94,15 +93,14 @@ lazy val `sbt-bom` = project
   )
 
 lazy val publishSettings = Seq(
-  ThisBuild / publishTo := {
+  publishTo := {
     val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
     if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
     else localStaging.value
   },
   pomIncludeRepository := { _ => false },
   publishMavenStyle := true,
   sbtPluginPublishLegacyMavenStyle := false,
-  sonatypeCredentialHost := sonatypeCentralHost,
   publishConfiguration := publishConfiguration.value.withOverwrite(true)
 )
 
@@ -120,7 +118,6 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
 
 useGpgAgent := false
 useGpgPinentry := true
-sonatypeProfileName := "com.here"
 
 // Defines the release process
 releaseIgnoreUntrackedFiles := true

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.8
+sbt.version=1.11.3

project/plugins.sbt

@@ -3,9 +3,7 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.5")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
-addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
 addSbtPlugin("com.here.platform.artifact" % "sbt-resolver" % "2.0.31")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")