Skip to content

Commit

Permalink
Merge branch 'master' into update/msgpack-core-0.8.24
Browse files Browse the repository at this point in the history
  • Loading branch information
tkrs authored Aug 6, 2021
2 parents 5cc5e22 + 4aef964 commit 4f04661
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
- 24224:24224
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v10
- uses: olafurpg/setup-scala@v12
with:
java-version: [email protected]
- run: sbt coverage +test coverageReport
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v2
with:
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
flags: unittests
Expand All @@ -28,15 +28,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v10
- uses: olafurpg/setup-scala@v12
with:
java-version: [email protected]
- run: sbt scalafmtCheckAll
scalafix:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v10
- uses: olafurpg/setup-scala@v12
with:
java-version: [email protected]
- run: sbt "scalafixAll --check"
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: olafurpg/setup-scala@v10
- uses: olafurpg/setup-scala@v12
with:
java-version: [email protected]
- uses: olafurpg/setup-gpg@v3
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object Dependencies {

val msgpackJava = "0.8.24"
val mess = "0.2.5"
val scalaLogging = "3.9.3"
val scalaLogging = "3.9.4"
val logback = "1.2.3"

val scalatest = "3.2.9"
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.5.2
sbt.version=1.5.5
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")

0 comments on commit 4f04661

Please sign in to comment.