Skip to content

Commit

Permalink
Merge branch 'series/0.6.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist committed Nov 19, 2023
2 parents a2114bd + 1674269 commit dd5c6f3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.12]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -336,6 +335,6 @@ jobs:
export SERVER_CERT=$(cat world/server.crt)
docker-compose up -d
- run: sbt '++ ${{ matrix.scala }}' coverage skunkJVM/test coverageReport
- run: sbt coverage skunkJVM/test coverageReport

- uses: codecov/codecov-action@v3
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "3.7.15"
version = "3.7.17"
runner.dialect = Scala213Source3
project.includePaths = [] # disables formatting
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ ThisBuild / githubWorkflowAddedJobs +=
WorkflowJob(
id = "coverage",
name = s"Generate coverage report (2.13 JVM only)",
scalas = List(`scala-2.13`),
scalas = Nil,
sbtStepPreamble = Nil,
steps = githubWorkflowJobSetup.value.toList ++
List(
WorkflowStep.Sbt(List("coverage", "skunkJVM/test", "coverageReport")),
Expand Down Expand Up @@ -171,7 +172,7 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
"org.scalameta" %%% "munit" % "1.0.0-M10",
"org.scalameta" % "junit-interface" % "1.0.0-M10",
"org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2",
"org.typelevel" %%% "munit-cats-effect" % "2.0.0-M3",
"org.typelevel" %%% "munit-cats-effect" % "2.0.0-M4",
"org.typelevel" %%% "cats-free" % "2.10.0",
"org.typelevel" %%% "cats-laws" % "2.10.0",
"org.typelevel" %%% "cats-effect-testkit" % "3.5.2",
Expand Down
5 changes: 2 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ ThisBuild / libraryDependencySchemes ++= Seq(
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
)

addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.2")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.2")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.8")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16")
Expand Down

0 comments on commit dd5c6f3

Please sign in to comment.