Skip to content

Commit

Permalink
We are targeting JVM 17 (and 21 for tests)
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz committed Jun 27, 2024
1 parent 9a1f0de commit 9215fb0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@ jobs:
check-binary-compatibility:
name: Binary Compatibility
uses: playframework/.github/.github/workflows/binary-check.yml@v4
with:
java: 11

check-docs:
name: Docs
uses: playframework/.github/.github/workflows/cmd.yml@v4
with:
java: 11
cmd: sbt docs/validateDocs

tests:
Expand All @@ -40,7 +37,7 @@ jobs:
- "check-docs"
uses: playframework/.github/.github/workflows/cmd.yml@v4
with:
java: 21, 17, 11
java: 21, 17
scala: 2.12.x, 2.13.x, 3.x
cmd: scripts/test-code.sh

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ jobs:
publish-artifacts:
name: Publish / Artifacts
uses: playframework/.github/.github/workflows/publish.yml@v4
with:
java: 11
secrets: inherit
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ def playJsonMimaSettings = Seq(

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

val scalacOpts = Seq(
"-language:higherKinds",
"-release",
"11",
"17",
"-Ywarn-unused:imports",
"-Xlint:nullary-unit",
"-Xlint",
Expand Down Expand Up @@ -96,7 +96,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", "11"), // sbt #1785, avoids passing to javadoc
Compile / compile / javacOptions ++= Seq("--release", "17"), // 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 9215fb0

Please sign in to comment.