Merge pull request #29 from guardian/mc-fix-build

Fix cross-building using latest SBT features

build.sbt

@@ -10,11 +10,15 @@ val Scala3 = "3.3.1"
 
 ThisBuild / scalaVersion := Scala213
 
+ThisBuild / publishTo := sonatypePublishToBundle.value
+
 lazy val sharedSettings = Seq(
   scalacOptions ++= Seq("-feature", "-deprecation"),
   libraryDependencies ++= Seq(
     "org.scalatest" %% "scalatest" % "3.2.17" % Test
-  )
+  ),
+  Test / publishArtifact := false,
+  publishConfiguration := publishConfiguration.value.withOverwrite(true)
 )
 
 val Brotli4jVersion = "1.12.0"
@@ -169,31 +173,21 @@ lazy val `play-brotli-filter-root` = (project in file("."))
   .aggregate(akka, pekko, `play-v28`,`play-v29` ,`play-v30`)
   .settings(
     publish / skip := true,
+    crossScalaVersions := Nil,
 
-    releaseCrossBuild := true,
-
-    Test / publishArtifact := false,
-
-    releasePublishArtifactsAction := PgpKeys.publishSigned.value,
-
-    publishTo := Some(
-      if (isSnapshot.value)
-        Opts.resolver.sonatypeOssSnapshots.head /* Take first repo */
-      else
-        Opts.resolver.sonatypeStaging
-    ),
-
+    /* deactivate cross-building and use `+` on `test` and `publishSigned` see https://www.scala-sbt.org/1.x/docs/Cross-Build.html */
+    releaseCrossBuild := false,
     releaseProcess := Seq(
       checkSnapshotDependencies,
       inquireVersions,
       runClean,
-      runTest,
+      releaseStepCommandAndRemaining("+test"),
       setReleaseVersion,
       commitReleaseVersion,
       tagRelease,
-      publishArtifacts,
+      releaseStepCommandAndRemaining("+publishSigned"),
       setNextVersion,
       commitNextVersion,
-      releaseStepCommand("sonatypeReleaseAll")
+      releaseStepCommand("sonatypeBundleRelease")
     )
   )

project/plugins.sbt

@@ -1,4 +1,4 @@
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
 addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")

version.sbt

@@ -1 +1 @@
-ThisBuild / version := "0.13-SNAPSHOT"
+ThisBuild / version := "0.14-SNAPSHOT"