Merge branch 'master' into update/lift-json-3.5.0

.github/workflows/scala-steward.yml

@@ -8,16 +8,15 @@ jobs:
   scala-steward:
     runs-on: ubuntu-latest
     timeout-minutes: 30
+    if: ${{ github.repository_owner == 'foundweekends' }}
     steps:
     - name: Generate token
       id: generate_token
       uses: tibdex/github-app-token@v1
-      if: ${{ !github.event.repository.fork }}
       with:
         app_id: 89697
         private_key: ${{ secrets.FOUNDWEEKENDS_BOT_KEY }}
     - name: Launch Scala Steward
-      if: ${{ !github.event.repository.fork }}
       uses: scala-steward-org/[email protected]
       with:
         github-token: ${{ steps.generate_token.outputs.token }}

build.sbt

@@ -84,7 +84,7 @@ lazy val root = (project in file(".")).
       val old = (Compile / packageSrc / mappings).value
       old filter { case (_, p) => p != "META-INF/MANIFEST.MF" }
     },
-    Proguard / proguardVersion := "7.1.1",
+    Proguard / proguardVersion := "7.2.0",
     Proguard / proguardOptions ++= Seq(
       "-keep class conscript.* { *; }",
       "-keep class dispatch.* { *; }",

project/Dependencies.scala

@@ -5,6 +5,6 @@ object Dependencies {
   val scalaSwing        = "org.scala-lang.modules" %% "scala-swing" % "3.0.0"
   val dispatchCore      = "net.databinder.dispatch" %% "dispatch-core" % "0.12.3"
   val scopt             = "com.github.scopt" %% "scopt" % "4.0.1"
-  val liftJson          = "net.liftweb" %% "lift-json" % "3.5.0"
-  val slf4jJdk14        = "org.slf4j" % "slf4j-jdk14" % "1.7.33"
+  val liftJson          = "net.liftweb" %% "lift-json" % "2.6.3"
+  val slf4jJdk14        = "org.slf4j" % "slf4j-jdk14" % "1.7.35"
 }