Skip to content

Commit 37c2d7b

Browse files
committed
Update dependencies
1 parent d4e53c8 commit 37c2d7b

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

.github/workflows/scala.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
scala: ["2.11.12", "2.12.11", "2.13.1"]
10+
scala: ["2.11.12", "2.12.15", "2.13.7"]
1111

1212
steps:
1313
- uses: actions/checkout@v2
14-
- uses: olafurpg/setup-scala@v7
14+
- uses: olafurpg/setup-scala@v12
1515
with:
1616
java-version: [email protected]
1717
- name: Run tests

build.sbt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import xerial.sbt.Sonatype._
22

3-
lazy val scala213 = "2.13.1"
4-
lazy val scala212 = "2.12.11"
3+
lazy val scala213 = "2.13.7"
4+
lazy val scala212 = "2.12.15"
55
lazy val scala211 = "2.11.12"
66

77
lazy val supportedScalaVersions = List(scala211, scala212, scala213)
@@ -13,7 +13,7 @@ ThisBuild / homepage := Some(url("http://github.com/oleg-py/better-monadic-for")
1313
ThisBuild / scalaVersion := Option(System.getenv("SCALA_VERSION")).filter(_.nonEmpty).getOrElse(scala213)
1414

1515
val testSettings = Seq(
16-
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
16+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.4" % Test,
1717
Test / scalacOptions ++= {
1818
val jar = (betterMonadicFor / Compile / packageBin).value
1919
Seq(s"-Xplugin:${jar.getAbsolutePath}", s"-Jdummy=${jar.lastModified}") // ensures recompile
@@ -60,10 +60,10 @@ lazy val pcplodTests = (project in file("pcplod-tests"))
6060
"org.ensime" %% "pcplod" % "1.2.1" % Test
6161
),
6262
// WORKAROUND https://github.com/ensime/pcplod/issues/12
63-
fork in Test := true,
64-
javaOptions in Test ++= Seq(
65-
s"""-Dpcplod.settings=${(scalacOptions in Test).value.filterNot(_.contains(",")).mkString(",")}""",
66-
s"""-Dpcplod.classpath=${(fullClasspath in Test).value.map(_.data).mkString(",")}"""
63+
Test / fork := true,
64+
Test / javaOptions ++= Seq(
65+
s"""-Dpcplod.settings=${(Test / scalacOptions).value.filterNot(_.contains(",")).mkString(",")}""",
66+
s"""-Dpcplod.classpath=${(Test / fullClasspath).value.map(_.data).mkString(",")}"""
6767
)
6868
)
6969
.settings(testSettings)
@@ -72,7 +72,7 @@ lazy val catsTests = (project in file("cats-tests"))
7272
.dependsOn(pluginTests % "compile->compile;test->test")
7373
.settings(
7474
name := "cats-tests",
75-
crossScalaVersions := List(scala211, scala212),
75+
crossScalaVersions := supportedScalaVersions,
7676
libraryDependencies ++= Seq(
7777
"org.typelevel" %% "cats-core" % "2.0.0" % Test
7878
)
@@ -84,9 +84,9 @@ lazy val scalazTests = (project in file("scalaz-tests"))
8484
.dependsOn(pluginTests % "compile->compile;test->test")
8585
.settings(
8686
name := "scalaz-tests",
87-
crossScalaVersions := List(scala211, scala212),
87+
crossScalaVersions := supportedScalaVersions,
8888
libraryDependencies ++= Seq(
89-
"org.scalaz" %% "scalaz-core" % "7.2.27" % Test,
89+
"org.scalaz" %% "scalaz-core" % "7.2.33" % Test,
9090
)
9191
)
9292
.settings(testSettings)
@@ -95,8 +95,8 @@ lazy val wartRemoverTests = (project in file("wartremover-tests"))
9595
.dependsOn(pluginTests % "compile->compile;test->test")
9696
.settings(
9797
name := "wartremover-tests",
98-
crossScalaVersions := List(scala212),
99-
addCompilerPlugin("org.wartremover" %% "wartremover" % "2.4.2"),
98+
crossScalaVersions := supportedScalaVersions,
99+
addCompilerPlugin("org.wartremover" %% "wartremover" % "2.4.3"),
100100
scalacOptions += "-P:wartremover:traverser:org.wartremover.warts.NonUnitStatements"
101101
)
102102
.settings(testSettings)

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.2.8
1+
sbt.version = 1.6.1

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
2-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
1+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
2+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")

0 commit comments

Comments
 (0)