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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ permissions:

jobs:
test:
uses: evolution-gaming/scala-github-actions/.github/workflows/ci.yml@61f111a4472fde7b63e5921ac8a238f22d1bb028 # v7.0.1
uses: evolution-gaming/scala-github-actions/.github/workflows/ci.yml@61f111a4472fde7b63e5921ac8a238f22d1bb028 # v7.0.1
with:
scala_versions: '["3.3.8"]'
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ jobs:
uses: evolution-gaming/scala-github-actions/.github/workflows/release.yml@61f111a4472fde7b63e5921ac8a238f22d1bb028 # v7.0.1
secrets: inherit
with:
verify_sbt_command: 'clean; check; all test package'
verify_sbt_command: 'cleanFull; check; all testFull package'
publish_sbt_command: 'publish'
13 changes: 6 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import Dependencies.*
import ProjectMatrixSyntax.*
import sbt.Keys.*
import sbt.Project.projectToRef
import sbt.internal.ProjectMatrix
import sbt.ProjectMatrix

lazy val scalaVersions = Seq("2.13.18", "3.3.8")

lazy val commonSettings = Seq(
organization := "com.evolutiongaming",
homepage := Some(url("https://github.com/evolution-gaming/sequentially")),
homepage := Some(uri("https://github.com/evolution-gaming/sequentially")),
startYear := Some(2018),
organizationName := "Evolution",
organizationHomepage := Some(url("https://evolution.com")),
licenses := Seq(("MIT", url("https://opensource.org/licenses/MIT"))),
organizationHomepage := Some(uri("https://evolution.com")),
licenses := Seq(("MIT", uri("https://opensource.org/licenses/MIT"))),

// compiler settings
Compile / scalacOptions ++= {
Expand Down Expand Up @@ -50,7 +49,7 @@ lazy val root = project
`sequentially-ce`.projectRefs ++
`sequentially-ce-metrics`.projectRefs ++
`sequentially-metrics`.projectRefs :+
projectToRef(benchmark)): _*
projectToLocalProject(benchmark)) *
)

lazy val sequentially = projectMatrix
Expand Down Expand Up @@ -154,8 +153,8 @@ lazy val `sequentially-metrics` = projectMatrix

//used by evolution-gaming/scala-github-actions
addCommandAlias("check", "all versionPolicyCheck Compile/doc scalafmtCheckRepo")

addCommandAlias("fmt", "scalafmtRepo")
addCommandAlias("build", "all compile testFull")

def asAkkaPekkoModule(
akkaDependencies: Seq[ModuleID] = Seq.empty,
Expand Down
2 changes: 1 addition & 1 deletion project/ProjectMatrixSyntax.scala
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import sbt.internal.ProjectMatrix
import sbt.ProjectMatrix

/** Provides missing syntax for [[ProjectMatrix]] */
object ProjectMatrixSyntax {
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.13.0
sbt.version = 2.0.8
2 changes: 0 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.3.0")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1")

addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")

addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0")