Skip to content

Commit

Permalink
Merge pull request #395 from armanbilge/update/sbt-typelevel-0.7.3
Browse files Browse the repository at this point in the history
Update sbt-typelevel, ... to 0.7.3
  • Loading branch information
armanbilge authored Oct 1, 2024
2 parents b43ead7 + f7ee724 commit e4a31cb
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
20 changes: 18 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -107,6 +111,10 @@ jobs:
java: [temurin@21]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -171,13 +179,17 @@ 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]
java: [temurin@21]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -235,6 +247,10 @@ jobs:
java: [temurin@21]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
if: contains(runner.os, 'macos')
run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand All @@ -258,7 +274,7 @@ jobs:

- name: Publish site
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
uses: peaceiris/actions-gh-pages@v3.9.3
uses: peaceiris/actions-gh-pages@v4.0.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: site/target/docs/site
Expand Down
1 change: 1 addition & 0 deletions .scalafix.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
rules = [OrganizeImports]

OrganizeImports.removeUnused = false
OrganizeImports.targetDialect = Scala3
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val sbtTypelevelVersion = "0.6.7"
val sbtTypelevelVersion = "0.7.3"
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % sbtTypelevelVersion)
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
Expand Down
2 changes: 1 addition & 1 deletion todo-mvc/src/main/scala/todomvc/TodoMvc.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import cats.syntax.all.*
import fs2.concurrent.*
import fs2.dom.*
import io.circe
import io.circe.Decoder.Result
import io.circe.*
import io.circe.Decoder.Result
import io.circe.syntax.*
import org.http4s.*
import org.scalajs.dom.KeyValue
Expand Down

0 comments on commit e4a31cb

Please sign in to comment.