Merge branch 'main' into update/pureconfig-core-0.17.6

etspaceman · Feb 28, 2024 · 5c04534 · 5c04534
2 parents 98c9111 + acf4720
commit 5c04534
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
@@ -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
 
@@ -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
 
@@ -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
 

diff --git a/build.sbt b/build.sbt
@@ -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.12"
 val Scala3 = "3.3.1"
 

diff --git a/project/LibraryDependencies.scala b/project/LibraryDependencies.scala
@@ -4,7 +4,7 @@ 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.6"
   val ScalaParsingCombinators =
     "org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.9.8
+sbt.version = 1.9.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -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")