From ed2709e8e1c949e3f4f0b01e8172d195664bcedd Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Thu, 9 Nov 2023 00:40:41 +0000 Subject: [PATCH] YML: Make java11 primary, remove java8 This will also allow using mdoc-parser which no longer works with java8. --- .github/workflows/ci.yml | 5 +---- .github/workflows/release.yml | 2 +- build.sbt | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f9b8befaa..6590131440 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,11 +17,8 @@ jobs: strategy: fail-fast: false matrix: - java: [ '8', '11' ] + java: [ '11' ] os: [windows-latest, ubuntu-latest] - exclude: - - os: windows-latest - java: '8' runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5168dee45c..89c75b23c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' cache: 'sbt' - name: Publish ${{ github.ref }} diff --git a/build.sbt b/build.sbt index 96975bf0fc..7940c5be12 100644 --- a/build.sbt +++ b/build.sbt @@ -188,7 +188,6 @@ import sbtassembly.AssemblyPlugin.defaultUniversalScript val scalacJvmOptions = Def.setting { val cross = CrossVersion.partialVersion(scalaVersion.value) match { - case Some((2, 11)) => Seq("-target:jvm-1.8") case Some((2, 13)) => Seq( "-Ymacro-annotations",