Fix the publishing (sksamuel#894)

Author: joan38

.github/workflows/master.yml

@@ -43,7 +43,7 @@ jobs:
           echo "email:       ${{ steps.import_gpg.outputs.email }}"
 
       - name: publish snapshot
-        run: sbt publish
+        run: sbt publishSigned
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.github/workflows/pr_scala_3.yml

@@ -26,3 +26,13 @@ jobs:
 
       - name: run tests
         run: sbt test
+
+      - name: Import GPG key
+        id: import_gpg
+        uses: crazy-max/ghaction-import-gpg@v3
+        with:
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.PGP_PASSPHRASE }}
+
+      - name: publish local
+        run: sbt publishLocalSigned

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
           echo "email:       ${{ steps.import_gpg.outputs.email }}"
 
       - name: publish release
-        run: sbt publishSigned
+        run: sbt sonaUpload sonaRelease
         env:
           RELEASE_VERSION: ${{ github.event.inputs.version }}
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}

project/Build.scala

@@ -5,7 +5,6 @@ import sbt.*
 object Build extends AutoPlugin {
 
   object autoImport {
-    val org = "com.sksamuel.avro4s"
     val AvroVersion = "1.11.5"
     val Log4jVersion = "1.2.17"
     val ScalatestVersion = "3.2.17"
@@ -31,7 +30,6 @@ object Build extends AutoPlugin {
 
   override def trigger = allRequirements
   override def projectSettings = publishingSettings ++ Seq(
-    organization := org,
     scalaVersion := "3.3.7",
     resolvers += Resolver.mavenLocal,
     Test / parallelExecution := false,
@@ -47,42 +45,26 @@ object Build extends AutoPlugin {
   )
 
   val publishingSettings = Seq(
+    pomIncludeRepository := { _ => false },
     publishMavenStyle := true,
     Test / publishArtifact := false,
+    publishTo := {
+      val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
+      if (isSnapshot.value) Some("central-snapshots" at centralSnapshots)
+      else localStaging.value
+    },
     credentials += Credentials(
-      "Sonatype Nexus Repository Manager",
-      "s01.oss.sonatype.org",
+      null,
+      "central.sonatype.com",
       ossrhUsername,
       ossrhPassword
     ),
     version := publishVersion,
-    publishTo := {
-      if (isRelease)
-        Some("releases" at "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
-      else
-        Some("snapshots" at "https://central.sonatype.com/repository/maven-snapshots/")
-    },
-    pomExtra := {
-      <url>https://github.com/sksamuel/avro4s</url>
-        <licenses>
-          <license>
-            <name>The Apache 2.0 License</name>
-            <url>https://opensource.org/licenses/Apache-2.0</url>
-            <distribution>repo</distribution>
-          </license>
-        </licenses>
-        <scm>
-          <url>git@github.com:sksamuel/avro4s.git</url>
-          <connection>scm:git@github.com:sksamuel/avro4s.git</connection>
-        </scm>
-        <developers>
-          <developer>
-            <id>sksamuel</id>
-            <name>sksamuel</name>
-            <url>http://github.com/sksamuel</url>
-          </developer>
-        </developers>
-    }
+    organization := "com.sksamuel.avro4s",
+    homepage := Some(url("https://github.com/sksamuel/avro4s")),
+    scmInfo := Some(ScmInfo(url("https://github.com/sksamuel/avro4s"), "scm:git@github.com:sksamuel/avro4s.git")),
+    licenses := List("The Apache 2.0 License" -> url("https://opensource.org/licenses/Apache-2.0")),
+    developers := List(Developer("sksamuel", "sksamuel", "", url("http://github.com/sksamuel")))
   )
 }
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.6
+sbt.version=1.12.0