Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly upgrade pegdown's transitive parboiled-java dependency #155

Merged
merged 3 commits into from
Sep 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ concurrency:
jobs:
check-code-style:
name: Code Style
uses: playframework/.github/.github/workflows/cmd.yml@v2
uses: playframework/.github/.github/workflows/cmd.yml@v3
with:
cmd: sbt validateCode

tests:
name: Tests
needs:
- "check-code-style"
uses: playframework/.github/.github/workflows/cmd.yml@v2
uses: playframework/.github/.github/workflows/cmd.yml@v3
with:
java: 11, 8
scala: 2.12.15, 2.13.8
java: 17, 11
scala: 2.12.17, 2.13.9
cmd: sbt ++$MATRIX_SCALA test

finish:
name: Finish
if: github.event_name == 'pull_request'
needs: # Should be last
- "tests"
uses: playframework/.github/.github/workflows/rtm.yml@v2
uses: playframework/.github/.github/workflows/rtm.yml@v3
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ on:
jobs:
publish-artifacts:
name: Publish / Artifacts
uses: playframework/.github/.github/workflows/publish.yml@v2
uses: playframework/.github/.github/workflows/publish.yml@v3
secrets: inherit
18 changes: 9 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
}

lazy val `play-doc` = (project in file("."))
.enablePlugins(PlayLibrary, SbtTwirl, PlayReleaseBase)
.enablePlugins(PlayLibrary, SbtTwirl)
.settings(
crossScalaVersions := Seq(scala212, scala213)
)

libraryDependencies ++= Seq(
"org.pegdown" % "pegdown" % "1.6.0",
"commons-io" % "commons-io" % "2.11.0",
"org.specs2" %% "specs2-core" % "4.16.1" % Test
("org.pegdown" % "pegdown" % "1.6.0").exclude("org.parboiled", "parboiled-java"),
"org.parboiled" % "parboiled-java" % "1.4.1",
"commons-io" % "commons-io" % "2.11.0",
"org.specs2" %% "specs2-core" % "4.16.1" % Test
)

javacOptions ++= Seq(
"-source",
"1.8",
"-target",
"1.8",
"--release",
"11",
"-Xlint:deprecation",
"-Xlint:unchecked",
)

scalacOptions ++= Seq(
"-target:jvm-1.8",
"-release",
"11",
"-encoding",
"utf8",
"-deprecation",
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("com.typesafe.play" % "interplay" % "3.0.5")
addSbtPlugin("com.typesafe.play" % "interplay" % "3.1.0-RC3")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")