From 5cbcc7b145dc5611168024efe4a80d9d2c6cc67f Mon Sep 17 00:00:00 2001 From: "nafg-scala-steward[bot]" <243680+nafg-scala-steward[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 20:19:21 +0000 Subject: [PATCH 1/2] Update scala3-library, ... to 3.3.3 --- .github/workflows/ci.yml | 4 ++-- build.sbt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08490bd..40633f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.13, 3.3.1] + scala: [2.13.12, 3.3.3] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -73,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.3.1] + scala: [3.3.3] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 1bb7a95..b05171f 100644 --- a/build.sbt +++ b/build.sbt @@ -11,8 +11,8 @@ def myScalacOptions(version: String) = inThisBuild( List( organization := "io.github.nafg.css-dsl", - scalaVersion := "3.3.1", - crossScalaVersions := Seq("2.13.13", scalaVersion.value), + scalaVersion := "3.3.3", + crossScalaVersions := Seq("2.13.12", scalaVersion.value), scalacOptions ++= myScalacOptions(scalaVersion.value), versionScheme := Some("early-semver") ) From 2d084e078ba60be88c3818691ad7669e7ae0b9a9 Mon Sep 17 00:00:00 2001 From: "nafg-scala-steward[bot]" <243680+nafg-scala-steward[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 20:19:58 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 12 ++++++------ .mergify.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40633f1..24cf6af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,22 +101,22 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.13.13) + - name: Download target directories (2.13.12) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.13-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }} - - name: Inflate target directories (2.13.13) + - name: Inflate target directories (2.13.12) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.1) + - name: Download target directories (3.3.3) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }} + name: target-${{ matrix.os }}-3.3.3-${{ matrix.java }} - - name: Inflate target directories (3.3.1) + - name: Inflate target directories (3.3.3) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index 7103a8a..953c34d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,8 +8,8 @@ pull_request_rules: - or: - author=scala-steward - author=nafg-scala-steward[bot] - - check-success=Build and Test (ubuntu-latest, 2.13.13, temurin@11) - - check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@11) + - check-success=Build and Test (ubuntu-latest, 2.13.12, temurin@11) + - check-success=Build and Test (ubuntu-latest, 3.3.3, temurin@11) actions: queue: name: default