Skip to content

Commit

Permalink
Merge branch 'updates-2024-04-05' into update/sbt-scoverage-2.0.11
Browse files Browse the repository at this point in the history
  • Loading branch information
dimitarg authored Apr 5, 2024
2 parents ecbc382 + 4eae23b commit ecca582
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.10, 2.12.17]
scala: [2.13.13, 2.12.19]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.10]
scala: [2.13.13]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -110,22 +110,22 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.10)
- name: Download target directories (2.13.13)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.13-${{ matrix.java }}

- name: Inflate target directories (2.13.10)
- name: Inflate target directories (2.13.13)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.17)
- name: Download target directories (2.12.19)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }}
name: target-${{ matrix.os }}-2.12.19-${{ matrix.java }}

- name: Inflate target directories (2.12.17)
- name: Inflate target directories (2.12.19)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
15 changes: 8 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import ReleaseTransformations._
name := "weaver-test-extra"
ThisBuild / organization := "io.github.dimitarg"

ThisBuild / scalaVersion := "2.13.10"
ThisBuild / crossScalaVersions := Seq("2.13.10", "2.12.17")
ThisBuild / scalaVersion := "2.13.13"
ThisBuild / crossScalaVersions := Seq("2.13.13", "2.12.19")

ThisBuild / githubWorkflowScalaVersions := Seq("2.13.10", "2.12.17")
ThisBuild / githubWorkflowScalaVersions := Seq("2.13.13", "2.12.19")

ThisBuild / githubWorkflowBuild := Seq(
WorkflowStep.Sbt(
Expand Down Expand Up @@ -43,9 +43,10 @@ ThisBuild / githubWorkflowPublishPreamble := Seq(WorkflowStep.Run(

ThisBuild / githubWorkflowPublish := Seq(WorkflowStep.Sbt(List("release cross with-defaults")))

val weaverVersion = "0.8.3"
val natchezVersion = "0.3.2"
val fs2Version = "3.7.0"
val weaverVersion = "0.8.4"
val natchezVersion = "0.3.5"
val fs2Version = "3.10.2"


libraryDependencies ++=Seq(
"com.disneystreaming" %% "weaver-scalacheck" % weaverVersion,
Expand All @@ -60,7 +61,7 @@ libraryDependencies ++=Seq(

testFrameworks += new TestFramework("weaver.framework.CatsEffect")

addCompilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full)
addCompilerPlugin("org.typelevel" % "kind-projector" % "0.13.3" cross CrossVersion.full)

releasePublishArtifactsAction := PgpKeys.publishSigned.value

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.8.2
sbt.version = 1.8.3
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.20")
Expand Down

0 comments on commit ecca582

Please sign in to comment.