diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ebaef9..2364bf4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,4 +10,6 @@ permissions: jobs: test: - uses: evolution-gaming/scala-github-actions/.github/workflows/ci.yml@61f111a4472fde7b63e5921ac8a238f22d1bb028 # v7.0.1 \ No newline at end of file + uses: evolution-gaming/scala-github-actions/.github/workflows/ci.yml@61f111a4472fde7b63e5921ac8a238f22d1bb028 # v7.0.1 + with: + scala_versions: '["3.3.8"]' \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a2e3a3..db1b854 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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' diff --git a/build.sbt b/build.sbt index ddf8222..1e4c783 100644 --- a/build.sbt +++ b/build.sbt @@ -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 ++= { @@ -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 @@ -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, diff --git a/project/ProjectMatrixSyntax.scala b/project/ProjectMatrixSyntax.scala index 79fe1ce..67fac13 100644 --- a/project/ProjectMatrixSyntax.scala +++ b/project/ProjectMatrixSyntax.scala @@ -1,4 +1,4 @@ -import sbt.internal.ProjectMatrix +import sbt.ProjectMatrix /** Provides missing syntax for [[ProjectMatrix]] */ object ProjectMatrixSyntax { diff --git a/project/build.properties b/project/build.properties index f693be1..d3093be 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.13.0 \ No newline at end of file +sbt.version = 2.0.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 95cf525..c3a3642 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")