From fce0502b20c59d64f2d2ecb90c22956367beb9e3 Mon Sep 17 00:00:00 2001 From: Scalameta Bot Date: Fri, 25 Oct 2024 01:06:31 +0000 Subject: [PATCH 1/2] Update scala-compiler, scala-library, ... to 2.13.15 --- build.sbt | 2 +- mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt | 2 +- mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 36ed95161..954cf58ae 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ addCommandAlias( ) def scala212 = "2.12.20" -def scala213 = "2.13.14" +def scala213 = "2.13.15" def scala3 = "3.3.3" def scala2Versions = List(scala212, scala213) def allScalaVersions = scala2Versions :+ scala3 diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt index 73ce8fd87..d774aa80e 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt @@ -1,5 +1,5 @@ ThisBuild / scalaVersion := "2.12.20" -ThisBuild / crossScalaVersions := List("2.12.20", "2.13.14", "3.3.3") +ThisBuild / crossScalaVersions := List("2.12.20", "2.13.15", "3.3.3") enablePlugins(MdocPlugin) mdocJS := Some(jsapp) diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt b/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt index 53eaf55f6..0685bf194 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt @@ -1,3 +1,3 @@ -ThisBuild / scalaVersion := "2.13.14" +ThisBuild / scalaVersion := "2.13.15" enablePlugins(MdocPlugin) From 34af3f48dcf65473a1e19efb8627364beb2b0a1a Mon Sep 17 00:00:00 2001 From: tgodzik Date: Fri, 25 Oct 2024 16:30:41 +0200 Subject: [PATCH 2/2] chore: Update all places to 2.13.14 --- .github/workflows/ci.yml | 4 ++-- .mergify.yml | 4 ++-- mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a70fff1bf..b82282051 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: with: java-version: 11 distribution: adopt - - run: sbt '++2.13.14 test' + - run: sbt '++2.13.15 test' shell: bash test: name: ${{ matrix.command }} ${{ matrix.java }} @@ -55,7 +55,7 @@ jobs: # Test legacy Scala versions, where reporting API changed - "'++2.12.12! testAllNonNative'" # compiler version too old for Scala Native - "'++2.12.19 test'" - - "'++2.13.14 test'" + - "'++2.13.15 test'" # Minimal supported version - "'++3.3.3 test'" - "scripted" diff --git a/.mergify.yml b/.mergify.yml index c858e8bda..d4b54001c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -7,12 +7,12 @@ pull_request_rules: - check-success=Windows - check-success="'++2.12.12! test' adopt@1.11" - check-success="'++2.12.19 test' adopt@1.11" - - check-success="'++2.13.14 test' adopt@1.11" + - check-success="'++2.13.15 test' adopt@1.11" - check-success="'++3.3.3 test' adopt@1.11" - check-success="scripted adopt@1.11" - check-success="'++2.12.12! test' 17" - check-success="'++2.12.19 test' 17" - - check-success="'++2.13.14 test' 17" + - check-success="'++2.13.15 test' 17" - check-success="'++3.3.3 test' 17" - check-success=scripted 17 actions: diff --git a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test index 95c6ade1a..aca3cd6f3 100644 --- a/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test +++ b/mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test @@ -1,6 +1,6 @@ > ++2.12.19 mdoc > check -> ++2.13.14 mdoc +> ++2.13.15 mdoc > check > ++3.3.3 mdoc > check