From 5413555ebc62e7300f639a854bea94e8cc2ba6a3 Mon Sep 17 00:00:00 2001 From: Peter Vlugter Date: Thu, 9 Jun 2022 01:50:38 +1200 Subject: [PATCH] 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 --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- build.sbt | 4 ++-- project/Dependencies.scala | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04a5a92b..69a50b30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ 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) @@ -32,19 +32,19 @@ jobs: 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 @@ -81,7 +81,7 @@ 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) @@ -89,19 +89,19 @@ jobs: 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 diff --git a/build.sbt b/build.sbt index ee2967b2..323a00ad 100644 --- a/build.sbt +++ b/build.sbt @@ -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*") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 683cafb4..64cd3b2e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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"