Skip to content

Commit

Permalink
Merge pull request #550 from mkurz/dropJava8
Browse files Browse the repository at this point in the history
Drop Java 8
  • Loading branch information
mkurz authored Sep 29, 2022
2 parents a38fc2f + 07af919 commit 34be646
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
cd docs
Expand All @@ -37,9 +37,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.12.17, 2.13.9, 3.2.0
cmd: scripts/test-code.sh

Expand All @@ -48,4 +48,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
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
8 changes: 3 additions & 5 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ object Common extends AutoPlugin {
"-encoding",
"UTF-8",
"-Xlint:-options",
"-source",
"1.8",
"-target",
"1.8",
"--release",
"11",
"-Xlint:deprecation",
"-Xlint:unchecked"
)
Expand All @@ -36,7 +34,7 @@ object Common extends AutoPlugin {
CrossVersion.partialVersion(version) match {
case Some((2, n)) if n < 12 =>
scalacParameters ++ Seq(
"-target:jvm-1.8",
"-release:11",
"-Ywarn-unused:imports",
"-Xlint:nullary-unit",
"-Xlint",
Expand Down

0 comments on commit 34be646

Please sign in to comment.