Skip to content

Commit

Permalink
bump: update to parboiled 1.4.1 for JDK 17 support (#526)
Browse files Browse the repository at this point in the history
* bump: update to parboiled 1.4.1 for JDK 17 support

* bump!: update to JDK 11 as minimum Java version
  • Loading branch information
pvlugter authored Jun 8, 2022
1 parent d4836c1 commit 5413555
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.15]
java: [temurin@8, temurin@11]
java: [temurin@11, temurin@17]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 8
java-version: 11

- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Cache sbt
uses: actions/cache@v2
Expand Down Expand Up @@ -81,27 +81,27 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.15]
java: [temurin@8]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 8
java-version: 11

- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
- name: Setup Java (temurin@17)
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Cache sbt
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ inThisBuild(

// https://github.com/djspiewak/sbt-github-actions
ThisBuild / githubWorkflowJavaVersions := List(
JavaSpec.temurin("8"),
JavaSpec.temurin("11")
JavaSpec.temurin("11"),
JavaSpec.temurin("17")
)
ThisBuild / githubWorkflowTargetBranches := Seq("master")
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object Version {
val foundation = "6.2.4"
val jtidy = "r938"
val pegdown = "1.6.0"
val parboiled = "1.3.1"
val parboiled = "1.4.1"
val prettify = "4-Mar-2013-1"
val sbtWeb = "1.4.4"
val scalatest = "3.2.12"
Expand Down

0 comments on commit 5413555

Please sign in to comment.