Skip to content

Commit 5413555

Browse files
authored
bump: update to parboiled 1.4.1 for JDK 17 support (#526)
* bump: update to parboiled 1.4.1 for JDK 17 support * bump!: update to JDK 11 as minimum Java version
1 parent d4836c1 commit 5413555

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

Diff for: .github/workflows/ci.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ jobs:
2424
matrix:
2525
os: [ubuntu-latest]
2626
scala: [2.12.15]
27-
java: [temurin@8, temurin@11]
27+
java: [temurin@11, temurin@17]
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: Checkout current branch (full)
3131
uses: actions/checkout@v2
3232
with:
3333
fetch-depth: 0
3434

35-
- name: Setup Java (temurin@8)
36-
if: matrix.java == 'temurin@8'
35+
- name: Setup Java (temurin@11)
36+
if: matrix.java == 'temurin@11'
3737
uses: actions/setup-java@v2
3838
with:
3939
distribution: temurin
40-
java-version: 8
40+
java-version: 11
4141

42-
- name: Setup Java (temurin@11)
43-
if: matrix.java == 'temurin@11'
42+
- name: Setup Java (temurin@17)
43+
if: matrix.java == 'temurin@17'
4444
uses: actions/setup-java@v2
4545
with:
4646
distribution: temurin
47-
java-version: 11
47+
java-version: 17
4848

4949
- name: Cache sbt
5050
uses: actions/cache@v2
@@ -81,27 +81,27 @@ jobs:
8181
matrix:
8282
os: [ubuntu-latest]
8383
scala: [2.12.15]
84-
java: [temurin@8]
84+
java: [temurin@11]
8585
runs-on: ${{ matrix.os }}
8686
steps:
8787
- name: Checkout current branch (full)
8888
uses: actions/checkout@v2
8989
with:
9090
fetch-depth: 0
9191

92-
- name: Setup Java (temurin@8)
93-
if: matrix.java == 'temurin@8'
92+
- name: Setup Java (temurin@11)
93+
if: matrix.java == 'temurin@11'
9494
uses: actions/setup-java@v2
9595
with:
9696
distribution: temurin
97-
java-version: 8
97+
java-version: 11
9898

99-
- name: Setup Java (temurin@11)
100-
if: matrix.java == 'temurin@11'
99+
- name: Setup Java (temurin@17)
100+
if: matrix.java == 'temurin@17'
101101
uses: actions/setup-java@v2
102102
with:
103103
distribution: temurin
104-
java-version: 11
104+
java-version: 17
105105

106106
- name: Cache sbt
107107
uses: actions/cache@v2

Diff for: build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ inThisBuild(
3535

3636
// https://github.com/djspiewak/sbt-github-actions
3737
ThisBuild / githubWorkflowJavaVersions := List(
38-
JavaSpec.temurin("8"),
39-
JavaSpec.temurin("11")
38+
JavaSpec.temurin("11"),
39+
JavaSpec.temurin("17")
4040
)
4141
ThisBuild / githubWorkflowTargetBranches := Seq("master")
4242
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")

Diff for: project/Dependencies.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object Version {
2020
val foundation = "6.2.4"
2121
val jtidy = "r938"
2222
val pegdown = "1.6.0"
23-
val parboiled = "1.3.1"
23+
val parboiled = "1.4.1"
2424
val prettify = "4-Mar-2013-1"
2525
val sbtWeb = "1.4.4"
2626
val scalatest = "3.2.12"

0 commit comments

Comments
 (0)