diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 311f1da7..d3e283c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [3.8.3] + scala: [3.8.4] java: [temurin@25, temurin@17] project: [rootJS, rootJVM] exclude: diff --git a/.mergify.yml b/.mergify.yml index 6955f5e1..4bac75c1 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -13,9 +13,9 @@ pull_request_rules: - body~=labels:.*early-semver-patch - body~=labels:.*early-semver-minor - 'title=flake.lock: Update' - - status-success=Test (ubuntu-22.04, 3.8.3, temurin@25, rootJS) - - status-success=Test (ubuntu-22.04, 3.8.3, temurin@25, rootJVM) - - status-success=Test (ubuntu-22.04, 3.8.3, temurin@17, rootJVM) + - status-success=Test (ubuntu-22.04, 3.8.4, temurin@25, rootJS) + - status-success=Test (ubuntu-22.04, 3.8.4, temurin@25, rootJVM) + - status-success=Test (ubuntu-22.04, 3.8.4, temurin@17, rootJVM) actions: merge: {} - name: Label core PRs diff --git a/build.sbt b/build.sbt index b5ace390..b576b674 100644 --- a/build.sbt +++ b/build.sbt @@ -3,9 +3,9 @@ lazy val V = _root_.scalafix.sbt.BuildInfo ThisBuild / tlBaseVersion := "0.53" ThisBuild / tlJdkRelease := Some(17) ThisBuild / githubWorkflowJavaVersions := Seq("25", "17").map(JavaSpec.temurin(_)) -ThisBuild / scalaVersion := "3.8.3" -ThisBuild / crossScalaVersions := Seq("3.8.3") -ThisBuild / githubWorkflowScalaVersions := Seq("3.8.3") +ThisBuild / scalaVersion := "3.8.4" +ThisBuild / crossScalaVersions := Seq("3.8.4") +ThisBuild / githubWorkflowScalaVersions := Seq("3.8.4") Global / onChangedBuildSource := ReloadOnSourceChanges lazy val root = tlCrossRootProject