From 5f287805d135a61745e6112899ddd6a093205b9a Mon Sep 17 00:00:00 2001 From: Alex Cardell <29524087+alexcardell@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:10:47 +0000 Subject: [PATCH] Update Scala 3 version to 3.3.4 (#40) --- .github/workflows/ci.yml | 12 ++++-------- .scalafix.conf | 2 +- build.sbt | 2 +- project/plugins.sbt | 6 +++--- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87a354c..eb492d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,8 +35,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 @@ -112,8 +111,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 @@ -227,8 +225,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,8 +260,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 diff --git a/.scalafix.conf b/.scalafix.conf index 194bd25..0dd4931 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -31,5 +31,5 @@ OrganizeImports { "*" ] expandRelative = true - removeUnused = false + removeUnused = true } diff --git a/build.sbt b/build.sbt index c7773ea..75f320a 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,7 @@ ThisBuild / tlSitePublishBranch := Some("main") ThisBuild / tlSiteKeepFiles := false val Scala213 = "2.13.12" -val Scala33 = "3.3.3" +val Scala33 = "3.3.4" ThisBuild / crossScalaVersions := Seq(Scala213, Scala33) ThisBuild / scalaVersion := Scala213 // the default Scala diff --git a/project/plugins.sbt b/project/plugins.sbt index d4e7747..d4fef23 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.3") -addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.3") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.4") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("com.github.xuwei-k" % "unused-code-plugin" % "0.4.1")