From 287ba85424a2f1c38a0e89fc3188aaed3225fa03 Mon Sep 17 00:00:00 2001 From: Michael Stringer Date: Fri, 8 Aug 2025 11:08:30 +0100 Subject: [PATCH 1/4] Upgrade sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e97b272..489e0a7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.10 +sbt.version=1.11.4 From f74ef152b1dc00070362ca7c47732bfe423b1fb9 Mon Sep 17 00:00:00 2001 From: Michael Stringer Date: Fri, 8 Aug 2025 11:15:11 +0100 Subject: [PATCH 2/4] Update sbt plugins --- build.sbt | 13 +++++++++---- project/plugins.sbt | 5 ++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 9128ad0..186ca5c 100644 --- a/build.sbt +++ b/build.sbt @@ -44,7 +44,11 @@ lazy val rules = projectMatrix "ch.epfl.scala" %% "scalafix-core" % V.scalafixVersion, ), scalacOptions += "-Xsource:3", - publishTo := sonatypePublishToBundle.value, + publishTo := { + val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/" + if (isSnapshot.value) Some("central-snapshots" at centralSnapshots) + else localStaging.value + }, ) .defaultAxes(VirtualAxis.jvm) .jvmPlatform(rulesCrossVersions) @@ -122,7 +126,8 @@ import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations.* ThisBuild / releasePublishArtifactsAction := PgpKeys.publishSigned.value -ThisBuild / releaseProcess := Seq[ReleaseStep]( +ThisBuild / releaseCrossBuild := true +ThisBuild / releaseProcess := Seq[ReleaseStep]( checkSnapshotDependencies, inquireVersions, runClean, @@ -132,8 +137,8 @@ ThisBuild / releaseProcess := Seq[ReleaseStep]( setReleaseVersion, commitReleaseVersion, tagRelease, - releaseStepCommandAndRemaining("+publishSigned"), - releaseStepCommand("sonatypeBundleRelease"), + publishArtifacts, + releaseStepCommand("sonaRelease"), setNextVersion, commitNextVersion, pushChanges, diff --git a/project/plugins.sbt b/project/plugins.sbt index e42f4df..d98b8d7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,10 +2,9 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2") // code style addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5") // publishing/building -addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.1") +addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") From 4932290171df327b3b99148caf9de818816e74f3 Mon Sep 17 00:00:00 2001 From: Michael Stringer Date: Fri, 8 Aug 2025 11:16:24 +0100 Subject: [PATCH 3/4] Upgrade scalafix --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d98b8d7..b3ff647 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3") // code style addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") From 450f0edaba3fe803d783247ebb889b8180ffc823 Mon Sep 17 00:00:00 2001 From: Michael Stringer Date: Fri, 8 Aug 2025 11:18:01 +0100 Subject: [PATCH 4/4] Update scalafmt --- .scalafmt.conf | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index d0c0d04..39816d4 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,51 +1,51 @@ -version = 3.9.3 -runner.dialect = Scala213Source3 -maxColumn = 120 +version: 3.9.9 +runner.dialect: Scala213Source3 +maxColumn: 120 -rewrite.rules = [ +rewrite.rules: [ Imports RedundantBraces RedundantParens PreferCurlyFors ] -align.openParenCallSite = false -align.openParenDefnSite = false -danglingParentheses.callSite = false -danglingParentheses.defnSite = false +align.openParenCallSite: false +align.openParenDefnSite: false +danglingParentheses.callSite: false +danglingParentheses.defnSite: false # don't align arrows in match statements -align.preset = none +align.preset: none rewrite { - imports.sort = scalastyle + imports.sort: scalastyle redundantBraces { - generalExpressions = false - defnBodies = none - stringInterpolation = true + generalExpressions: false + defnBodies: none + stringInterpolation: true } - trailingCommas.style = always + trailingCommas.style: always } docstrings { - style = Asterisk - blankFirstLine = true - removeEmpty = true - wrap = false + style: Asterisk + blankFirstLine: true + removeEmpty: true + wrap: false } fileOverride { # sbt related files - *.sbt & project/*.scala "glob:**/*.sbt" { - runner.dialect = sbt1 + runner.dialect: sbt1 # align libraryDependencies - align.preset = most + align.preset: most } "glob:**/project/*.scala" { - runner.dialect = sbt1 + runner.dialect: sbt1 # align libraryDependencies - align.preset = more + align.preset: more } }