diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ac1e345..276bc515 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7] + scala: [2.13.8] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/.mergify.yml b/.mergify.yml index adbccf1b..630b17c6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -11,8 +11,7 @@ pull_request_rules: conditions: - author=scala-steward - body~=labels:.*semver-patch.* -# - status-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.8) - - status-success=Build and Test (ubuntu-latest, 2.13.7, adopt@1.8) + - check-success~=Build and Test actions: merge: method: merge diff --git a/project/ProjectSettings.scala b/project/ProjectSettings.scala index c9e8aad2..8f5f9e8c 100644 --- a/project/ProjectSettings.scala +++ b/project/ProjectSettings.scala @@ -12,7 +12,7 @@ object ProjectSettings { lazy val commonProfile: Project => Project = _ .enablePlugins(ScalaJSBundlerPlugin, ScalafixPlugin) .settings( - crossScalaVersions := Seq("2.13.7"), + crossScalaVersions := Seq("2.13.8"), scalaVersion := crossScalaVersions.value.last, webpackBundlingMode := BundlingMode.LibraryOnly(), useYarn := true, diff --git a/project/plugins.sbt b/project/plugins.sbt index 374ef7b4..88a99083 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,7 +10,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.0-RC1") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")