Skip to content

Commit

Permalink
Merge branch 'main' into update/scalacheck-1.17.1
Browse files Browse the repository at this point in the history
  • Loading branch information
hamnis authored Apr 17, 2024
2 parents 4c31385 + b35115a commit af880ab
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:

- name: Upload target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
path: targets.tar
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
run: sbt +update

- name: Download target directories (2.12, rootJVM)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM

Expand All @@ -157,7 +157,7 @@ jobs:
rm targets.tar
- name: Download target directories (2.13, rootJVM)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ val scala213 = "2.13.11"
ThisBuild / scalaVersion := scala213
ThisBuild / crossScalaVersions := Seq(scala212, scala213)

val circeVersion = "0.14.1"
val circeVersion = "0.14.6"
val scalacheckVersion = "1.17.1"
val disciplineScalatestVersion = "2.2.0"
val scalacheckScalaTestVersion = "3.2.18.0"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("io.circe" % "sbt-circe-org" % "0.3.0")
addSbtPlugin("io.circe" % "sbt-circe-org" % "0.3.1")

0 comments on commit af880ab

Please sign in to comment.