Skip to content

Commit

Permalink
Merge branch 'develop' into update/scala-library-2.12.16
Browse files Browse the repository at this point in the history
  • Loading branch information
regadas authored Aug 19, 2022
2 parents f4bc7a9 + 1a2a82c commit e22549c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
scala:
- 2.11.12
- 2.12.16
- 2.13.7
- 2.13.8
test-coverage:
runs-on: ubuntu-latest
steps:
Expand All @@ -40,7 +40,7 @@ jobs:
- name: java ${{matrix.java}} setup
uses: olafurpg/setup-scala@v13
- run: |
sbt ++2.12.12 coverage test coverageReport
sbt ++2.12.15 coverage test coverageReport
bash <(curl -s https://codecov.io/bash)
mimaReport:
runs-on: ubuntu-latest
Expand All @@ -61,7 +61,7 @@ jobs:
scala:
- 2.11.12
- 2.12.16
- 2.13.7
- 2.13.8
microsite:
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ val javaEwahVersion = "1.1.13"
val kindProjectorVersion = "0.13.2"
val paradiseVersion = "2.1.1"
val quasiquotesVersion = "2.1.0"
val scalaTestVersion = "3.2.12"
val scalaTestVersion = "3.2.13"
val scalaTestPlusVersion = "3.1.0.0-RC2"
val scalacheckVersion = "1.15.2"
val scalaCollectionCompat = "2.7.0"
val scalaCollectionCompat = "2.8.1"
val utilVersion = "21.2.0"
val sparkVersion = "2.4.8"

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.6.2
sbt.version=1.7.1
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.1")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")

0 comments on commit e22549c

Please sign in to comment.