diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index e97bcf7..50ecd8c 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -33,7 +33,7 @@ jobs: fail-fast: false matrix: java: [adopt@1.8, adopt@1.11] - scala: [2.12.15, 2.13.6] + scala: [2.12.16, 2.13.6] runs-on: ubuntu-latest steps: - name: Checkout current branch diff --git a/.mergify.yml b/.mergify.yml index e2848bb..e924929 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -9,9 +9,9 @@ pull_request_rules: conditions: - author=nryanov-auto - "status-success=scalafmt (adopt@1.11, 2.13.6)" - - "status-success=Scala 2.12.15, Java adopt@1.8" + - "status-success=Scala 2.12.16, Java adopt@1.8" - "status-success=Scala 2.13.6, Java adopt@1.8" - - "status-success=Scala 2.12.15, Java adopt@1.11 " + - "status-success=Scala 2.12.16, Java adopt@1.11 " - "status-success=Scala 2.13.6, Java adopt@1.11" actions: merge: diff --git a/build.sbt b/build.sbt index 5f7a0a6..348fe05 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ lazy val scalatestVersion = "3.2.11" lazy val testContainersVersion = "0.39.12" lazy val logbackVersion = "1.2.11" -val scala2_12 = "2.12.15" +val scala2_12 = "2.12.16" val scala2_13 = "2.13.6" val compileAndTest = "compile->compile;test->test"