From e70ccc9dc187a429ac6bbe43e35e30f8d5439adc Mon Sep 17 00:00:00 2001 From: Matthew de Detrich Date: Sat, 23 Mar 2024 09:20:54 +0100 Subject: [PATCH] Update Scala 2 versions Signed-off-by: Matthew de Detrich --- .github/workflows/ci.yml | 6 +++--- .github/workflows/clean.yml | 3 ++- project/Settings.scala | 4 ++-- project/plugins.sbt | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be97055..9cfeb7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,18 +22,18 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.18, 2.13.11] + scala: [2.12.19, 2.13.13] java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Java (temurin@11) if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 547aaa4..bfc865d 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -17,6 +17,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Delete artifacts + shell: bash {0} run: | # Customize those three lines with your repository and credentials: REPO=${GITHUB_API_URL}/repos/${{ github.repository }} @@ -25,7 +26,7 @@ jobs: ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; } # A temporary file which receives HTTP response headers. - TMPFILE=/tmp/tmp.$$ + TMPFILE=$(mktemp) # An associative array, key: artifact name, value: number of artifacts of that name. declare -A ARTCOUNT diff --git a/project/Settings.scala b/project/Settings.scala index 677fa50..9e4c550 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -6,8 +6,8 @@ import sbtrelease.ReleaseStateTransformations.* import xerial.sbt.Sonatype.autoImport.* object Settings { - val scala212Version: String = "2.12.18" - val scala213Version: String = "2.13.11" + val scala212Version: String = "2.12.19" + val scala213Version: String = "2.13.13" val currentScalaVersion: String = scala212Version val globalScalaVersion: String = currentScalaVersion diff --git a/project/plugins.sbt b/project/plugins.sbt index ea43f15..8cfd264 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,8 +2,8 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") -addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.9") -addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.15.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.10") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11") +addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.23.0") addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")