Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -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
}
}
13 changes: 9 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand All @@ -132,8 +137,8 @@ ThisBuild / releaseProcess := Seq[ReleaseStep](
setReleaseVersion,
commitReleaseVersion,
tagRelease,
releaseStepCommandAndRemaining("+publishSigned"),
releaseStepCommand("sonatypeBundleRelease"),
publishArtifacts,
releaseStepCommand("sonaRelease"),
setNextVersion,
commitNextVersion,
pushChanges,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.10
sbt.version=1.11.4
7 changes: 3 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
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")
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")