Skip to content

Commit 9eec2d6

Browse files
Merge branch 'master' into update/lift-json-3.5.0
2 parents f05e852 + 8697991 commit 9eec2d6

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.github/workflows/scala-steward.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ jobs:
88
scala-steward:
99
runs-on: ubuntu-latest
1010
timeout-minutes: 30
11+
if: ${{ github.repository_owner == 'foundweekends' }}
1112
steps:
1213
- name: Generate token
1314
id: generate_token
1415
uses: tibdex/github-app-token@v1
15-
if: ${{ !github.event.repository.fork }}
1616
with:
1717
app_id: 89697
1818
private_key: ${{ secrets.FOUNDWEEKENDS_BOT_KEY }}
1919
- name: Launch Scala Steward
20-
if: ${{ !github.event.repository.fork }}
2120
uses: scala-steward-org/[email protected]
2221
with:
2322
github-token: ${{ steps.generate_token.outputs.token }}

build.sbt

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

project/Dependencies.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ object Dependencies {
55
val scalaSwing = "org.scala-lang.modules" %% "scala-swing" % "3.0.0"
66
val dispatchCore = "net.databinder.dispatch" %% "dispatch-core" % "0.12.3"
77
val scopt = "com.github.scopt" %% "scopt" % "4.0.1"
8-
val liftJson = "net.liftweb" %% "lift-json" % "3.5.0"
9-
val slf4jJdk14 = "org.slf4j" % "slf4j-jdk14" % "1.7.33"
8+
val liftJson = "net.liftweb" %% "lift-json" % "2.6.3"
9+
val slf4jJdk14 = "org.slf4j" % "slf4j-jdk14" % "1.7.35"
1010
}

0 commit comments

Comments
 (0)