Skip to content

Commit

Permalink
Merge branch 'master' into update/scalatest-3.2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
tkrs committed Sep 28, 2021
2 parents dc12d84 + 7569334 commit 34cffcf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- 24224:24224
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v12
- uses: olafurpg/setup-scala@v13
with:
java-version: openjdk@1.11
- run: sbt coverage +test coverageReport
Expand All @@ -28,15 +28,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v12
- uses: olafurpg/setup-scala@v13
with:
java-version: openjdk@1.11
- run: sbt scalafmtCheckAll
scalafix:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v12
- uses: olafurpg/setup-scala@v13
with:
java-version: openjdk@1.11
- 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/checkout@v2.3.3
- uses: olafurpg/setup-scala@v12
- uses: olafurpg/setup-scala@v13
with:
java-version: openjdk@1.11
- uses: olafurpg/setup-gpg@v3
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.0.0
version = 3.0.5
maxColumn = 120
assumeStandardLibraryStripMargin = true

Expand Down
8 changes: 4 additions & 4 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.3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.30")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9")

0 comments on commit 34cffcf

Please sign in to comment.