Skip to content

Commit

Permalink
Merge branch 'main' into update/scala-library-2.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
etspaceman authored Feb 28, 2024
2 parents b42cfb3 + 2514b5c commit 41a2a8f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:

- name: Upload target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
path: targets.tar
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
run: sbt +update

- name: Download target directories (2.13)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13

Expand All @@ -127,7 +127,7 @@ jobs:
rm targets.tar
- name: Download target directories (3)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3

Expand All @@ -137,7 +137,7 @@ jobs:
rm targets.tar
- name: Download target directories (2.12)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12

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.7.17
version = 3.8.0
project.git = true
runner.dialect = scala213Source3

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import laika.helium.Helium
import laika.helium.config.TextLink
import laika.helium.config.ThemeNavigationSection

val Scala212 = "2.12.18"
val Scala212 = "2.12.19"
val Scala213 = "2.13.13"
val Scala3 = "3.3.1"

Expand Down
6 changes: 3 additions & 3 deletions project/LibraryDependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ object LibraryDependencies {
val ScalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.0"
val TypesafeConfig = "com.typesafe" % "config" % "1.4.3"
val ApacheCommons = "org.apache.commons" % "commons-lang3" % "3.14.0"
val KindProjector = "org.typelevel" % "kind-projector" % "0.13.2"
val KindProjector = "org.typelevel" % "kind-projector" % "0.13.3"
val PureConfig = "com.github.pureconfig" %% "pureconfig-core" % "0.17.4"
val ScalaParsingCombinators =
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0"

object Munit {
val munitVersion = "1.0.0-M10"
val munitVersion = "1.0.0-M11"
val core = "org.scalameta" %% "munit" % munitVersion
val scalacheck =
"org.scalameta" %% "munit-scalacheck" % munitVersion
Expand All @@ -21,7 +21,7 @@ object LibraryDependencies {
}

object Weaver {
val weaverVersion = "0.8.3"
val weaverVersion = "0.8.4"
val cats = "com.disneystreaming" %% "weaver-cats" % weaverVersion
val scalacheck =
"com.disneystreaming" %% "weaver-scalacheck" % weaverVersion
Expand Down
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.11.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.4")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.4")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.6.4")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mima" % "0.6.4")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.7")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.7")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.6.7")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mima" % "0.6.7")

0 comments on commit 41a2a8f

Please sign in to comment.