From 15f4bc0d5feef2c099667ff21f2353fbfcd67486 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 11 Jan 2022 12:26:49 +0100 Subject: [PATCH 1/2] Scala 2.13.8 --- .github/workflows/build-test.yml | 2 +- .mergify.yml | 8 ++++---- project/Dependencies.scala | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 268f71d2e..df592f129 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -81,7 +81,7 @@ jobs: strategy: matrix: jdk: [ 11, 8 ] - scala: [ 2.12.15, 2.13.7, 3.0.2 ] # Should be sync with Mergify conditions (.mergify.yml) + scala: [ 2.12.15, 2.13.8, 3.0.2 ] # Should be sync with Mergify conditions (.mergify.yml) name: Check / Tests (Scala ${{ matrix.scala }} & JDK ${{ matrix.jdk }}) steps: - name: Checkout diff --git a/.mergify.yml b/.mergify.yml index f15b8bdd0..7c2232c31 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,10 +6,10 @@ queue_rules: - check-success=Check / Binary Compatibility - check-success=Check / Docs - check-success=Check / Tests (Scala 2.12.15 & JDK 11) - - check-success=Check / Tests (Scala 2.13.7 & JDK 11) + - check-success=Check / Tests (Scala 2.13.8 & JDK 11) - check-success=Check / Tests (Scala 3.0.2 & JDK 11) - check-success=Check / Tests (Scala 2.12.15 & JDK 8) - - check-success=Check / Tests (Scala 2.13.7 & JDK 8) + - check-success=Check / Tests (Scala 2.13.8 & JDK 8) - check-success=Check / Tests (Scala 3.0.2 & JDK 8) pull_request_rules: @@ -19,10 +19,10 @@ pull_request_rules: - check-success=Check / Binary Compatibility - check-success=Check / Docs - check-success=Check / Tests (Scala 2.12.15 & JDK 11) - - check-success=Check / Tests (Scala 2.13.7 & JDK 11) + - check-success=Check / Tests (Scala 2.13.8 & JDK 11) - check-success=Check / Tests (Scala 3.0.2 & JDK 11) - check-success=Check / Tests (Scala 2.12.15 & JDK 8) - - check-success=Check / Tests (Scala 2.13.7 & JDK 8) + - check-success=Check / Tests (Scala 2.13.8 & JDK 8) - check-success=Check / Tests (Scala 3.0.2 & JDK 8) - status-success=typesafe-cla-validator - "#approved-reviews-by>=1" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6b0e891fc..ad69c8a52 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -3,6 +3,6 @@ object Dependencies { // - GA (.github/workflows/build-test.yml) // - Mergify conditions (.mergify.yml) val Scala212 = "2.12.15" - val Scala213 = "2.13.7" + val Scala213 = "2.13.8" val Scala3 = "3.0.2" } From c52000a9adea8b22f0fe8f8da7419216be41cc36 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 12 Jan 2022 07:15:26 +0100 Subject: [PATCH 2/2] Update silencer plugin --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6caf5ceaf..4063faab4 100644 --- a/build.sbt +++ b/build.sbt @@ -85,7 +85,7 @@ val scalacOpts = Seq( "-Ywarn-macros:after" ) -val silencerVersion = "1.7.7" +val silencerVersion = "1.7.8" ThisBuild / libraryDependencies ++= { if (isScala3.value) Nil