From 8d01f279f1adb288aba092077dea06d18ded31ef Mon Sep 17 00:00:00 2001 From: Meriam Lachkar Date: Fri, 27 Nov 2020 17:47:43 +0100 Subject: [PATCH] Update github actions (#178) + fix cli for 2.13.4 --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/release.yml | 4 ++-- .../scala/scalafix/internal/sbt/SbtCompletionsSuite.scala | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d1f95db..46ecee29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,14 +16,14 @@ jobs: - "++2.10.7 test 'scripted sbt-scalafix/* skip-windows/*'" steps: - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v7 + - uses: olafurpg/setup-scala@v10 - run: sbt ${{ matrix.command }} jdk11: name: JDK11 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v7 + - uses: olafurpg/setup-scala@v10 with: java-version: adopt@1.11 - run: sbt test scripted @@ -32,7 +32,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v7 + - uses: olafurpg/setup-scala@v10 - run: sbt ci-windows shell: bash checks: @@ -40,5 +40,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v7 + - uses: olafurpg/setup-scala@v10 - run: ./bin/scalafmt --test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 63ac5f9e..0326ffa3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,8 +8,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: olafurpg/setup-scala@v7 - - uses: olafurpg/setup-gpg@v2 + - uses: olafurpg/setup-scala@v10 + - uses: olafurpg/setup-gpg@v3 - run: git fetch --unshallow - name: Publish ${{ github.ref }} run: sbt ci-release diff --git a/src/test/scala/scalafix/internal/sbt/SbtCompletionsSuite.scala b/src/test/scala/scalafix/internal/sbt/SbtCompletionsSuite.scala index 7bc356a5..dab39443 100644 --- a/src/test/scala/scalafix/internal/sbt/SbtCompletionsSuite.scala +++ b/src/test/scala/scalafix/internal/sbt/SbtCompletionsSuite.scala @@ -94,7 +94,7 @@ class SbtCompletionsSuite extends AnyFunSuite { |DisableSyntax | Reports an error for disabled features such as var or XML literals. |ExplicitResultTypes - | Inserts type annotations for inferred public members. Only compatible with Scala 2.11.12, 2.12.10, 2.12.11, 2.12.12, 2.13.1, 2.13.2, 2.13.3. + | Inserts type annotations for inferred public members. Only compatible with Scala 2.11.12, 2.12.10, 2.12.11, 2.12.12, 2.13.2, 2.13.3, 2.13.4. |LeakingImplicitClassVal | Adds 'private' to val parameters of implicit value classes |NoAutoTupling