Skip to content

Commit

Permalink
try to support java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Jan 5, 2025
1 parent deaa603 commit a85f54d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
# - "check-binary-compatibility"
uses: playframework/.github/.github/workflows/cmd.yml@v4
with:
java: 21, 17
java: 21, 17, 11
scala: 2.12.x, 2.13.x, 3.x
cmd: scripts/test-code.sh

Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ def playJsonMimaSettings = Seq(

val javacSettings = Seq(
"-source",
"17",
"11",
"-Xlint:deprecation",
"-Xlint:unchecked",
)

val scalacOpts = Seq(
"-language:higherKinds",
"-release",
"17",
"11",
"-Ywarn-unused:imports",
"-Xlint:nullary-unit",
"-Xlint",
Expand Down Expand Up @@ -110,7 +110,7 @@ lazy val commonSettings = Def.settings(
crossScalaVersions := Seq(Dependencies.Scala212, Dependencies.Scala213, Dependencies.Scala3),
Compile / javacOptions ++= javacSettings,
Test / javacOptions ++= javacSettings,
Compile / compile / javacOptions ++= Seq("--release", "17"), // sbt #1785, avoids passing to javadoc
Compile / compile / javacOptions ++= Seq("--release", "11"), // sbt #1785, avoids passing to javadoc
scalacOptions ++= (if (isScala3.value) Nil else scalacOpts),
Compile / doc / scalacOptions ++= Seq(
// Work around 2.12 bug which prevents javadoc in nested java classes from compiling.
Expand Down

0 comments on commit a85f54d

Please sign in to comment.