diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index d4c0cff5..f6be1a22 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -15,17 +15,17 @@ 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 # check-binary-compatibility: # name: Binary Compatibility -# uses: playframework/.github/.github/workflows/binary-check.yml@v2 +# uses: playframework/.github/.github/workflows/binary-check.yml@v3 check-docs: name: Docs - uses: playframework/.github/.github/workflows/cmd.yml@v2 + uses: playframework/.github/.github/workflows/cmd.yml@v3 with: cmd: sbt doc @@ -35,9 +35,9 @@ jobs: # - "check-code-style" # - "check-binary-compatibility" - "check-docs" - uses: playframework/.github/.github/workflows/cmd.yml@v2 + uses: playframework/.github/.github/workflows/cmd.yml@v3 with: - java: 11, 8 + java: 17, 11 scala: 2.13.x cmd: | # Clone generated docs so that we can run some integration tests @@ -49,4 +49,4 @@ jobs: 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 diff --git a/build.sbt b/build.sbt index 627a139f..99934f04 100644 --- a/build.sbt +++ b/build.sbt @@ -7,8 +7,8 @@ scalaVersion := "2.13.12" scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked") libraryDependencies ++= Seq( - "com.typesafe.play" %% "play-doc" % "2.1.0", - "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.2.202306221912-r", + "com.typesafe.play" %% "play-doc" % "2.2.1", + "org.eclipse.jgit" % "org.eclipse.jgit" % "6.7.0.202309050840-r", "com.damnhandy" % "handy-uri-templates" % "2.1.8", "org.webjars" % "jquery" % "3.7.1", "org.webjars" % "html5shiv" % "3.7.3-1", diff --git a/project/build.properties b/project/build.properties index 563a014d..27430827 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.2 +sbt.version=1.9.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index 2ade2941..481974fc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.20") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-RC2") addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.4") addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2") addSbtPlugin("com.typesafe.sbt" % "sbt-stylus" % "1.1.0") diff --git a/test/resources/logback.xml b/test/resources/logback.xml index ab4b08e1..cda70994 100644 --- a/test/resources/logback.xml +++ b/test/resources/logback.xml @@ -1,15 +1,22 @@ - + + + + - + + + - - - %coloredLevel %logger{15} - %message%n%xException - - + + + %highlight(%-5level) %logger{15} - %message%n%xException + + - - - + + + - \ No newline at end of file +