Skip to content

Commit

Permalink
Merge branch 'main' into update/sbt-scalafix-0.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
etspaceman authored Oct 4, 2024
2 parents f1148e6 + 13a9575 commit 7983fc7
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 12 deletions.
18 changes: 17 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,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 @@ -98,6 +102,10 @@ jobs:
java: [temurin@17]
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 @@ -172,13 +180,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@17]
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 @@ -211,6 +223,10 @@ jobs:
java: [temurin@17]
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
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.2
version = 3.8.3
project.git = true
runner.dialect = scala213Source3

Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import laika.helium.Helium
import laika.helium.config.TextLink
import laika.helium.config.ThemeNavigationSection

val Scala212 = "2.12.19"
val Scala213 = "2.13.14"
val Scala3 = "3.3.3"
val Scala212 = "2.12.20"
val Scala213 = "2.13.15"
val Scala3 = "3.3.4"

val allScalaVersions = List(Scala213, Scala3, Scala212)

Expand Down
4 changes: 2 additions & 2 deletions project/LibraryDependencies.scala
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import sbt._

object LibraryDependencies {
val ScalaCheck = "org.scalacheck" %% "scalacheck" % "1.18.0"
val ScalaCheck = "org.scalacheck" %% "scalacheck" % "1.18.1"
val TypesafeConfig = "com.typesafe" % "config" % "1.4.3"
val ApacheCommons = "org.apache.commons" % "commons-lang3" % "3.14.0"
val ApacheCommons = "org.apache.commons" % "commons-lang3" % "3.17.0"
val KindProjector = "org.typelevel" % "kind-projector" % "0.13.3"
val PureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.7"
val ScalaParsingCombinators =
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.10.0
sbt.version = 1.10.2
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mima" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mima" % "0.7.3")

0 comments on commit 7983fc7

Please sign in to comment.