diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6f3828..00b7eff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,7 @@ jobs: timeout-minutes: 60 steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -117,8 +116,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -207,7 +205,7 @@ jobs: dependency-submission: name: Submit Dependencies - if: github.event_name != 'pull_request' + if: github.event.repository.fork == false && github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] @@ -215,8 +213,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -263,6 +260,9 @@ jobs: java: [temurin@11] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (fast) uses: actions/checkout@v4 diff --git a/build.sbt b/build.sbt index f3e6ae7..329f170 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import com.typesafe.tools.mima.core._ ThisBuild / organization := "io.circe" -ThisBuild / crossScalaVersions := Seq("2.13.14", "2.12.19", "3.3.4") +ThisBuild / crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4") ThisBuild / scalaVersion := crossScalaVersions.value.head ThisBuild / startYear := Some(2016) ThisBuild / tlBaseVersion := "0.14" diff --git a/project/plugins.sbt b/project/plugins.sbt index fb5014a..2df9cfc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,3 @@ -addSbtPlugin("io.circe" % "sbt-circe-org" % "0.4.2") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.1") +addSbtPlugin("io.circe" % "sbt-circe-org" % "0.4.5") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6") addSbtPlugin("com.timushev.sbt" % "sbt-rewarn" % "0.1.3")