From 2f893faaf20e69c84ad30cf6fb915318a5112b5a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 Jun 2023 04:12:06 +0000 Subject: [PATCH 1/2] Update scala-library to 2.12.18 --- .github/workflows/ci.yml | 4 ++-- build.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f671ceb..9b1e5fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.8] + scala: [2.12.18, 2.13.8] java: [adopt-hotspot@8, adopt-hotspot@11] runs-on: ${{ matrix.os }} steps: @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15] + scala: [2.12.18] java: [adopt-hotspot@8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 934e844..6d2acd8 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ homepage := Some(url("http://github.com/scaldi/scaldi-play")) licenses := Seq("Apache License, ASL Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")) scalaVersion := "2.13.8" -crossScalaVersions := Seq("2.12.15", "2.13.8") +crossScalaVersions := Seq("2.12.18", "2.13.8") mimaPreviousArtifacts := Set("0.6.0", "0.6.1").map(organization.value %% name.value % _) scalacOptions ++= Seq("-deprecation", "-feature") javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint") From 400c2901ff12392e369d38b0c409db2f471e0fa6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 Jun 2023 04:12:58 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b1e5fa..09a654a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.18] + scala: [2.12.15] java: [adopt-hotspot@8] runs-on: ${{ matrix.os }} steps: @@ -117,12 +117,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.15) + - name: Download target directories (2.12.18) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }} - - name: Inflate target directories (2.12.15) + - name: Inflate target directories (2.12.18) run: | tar xf targets.tar rm targets.tar