From 7d9ce51a066e6f30a1b62d2fd3af1b3d5374a086 Mon Sep 17 00:00:00 2001 From: "banno-diy-steward[bot]" <407453+banno-diy-steward[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 16:23:11 +0000 Subject: [PATCH 1/4] Update sbt-mdoc to 2.5.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index eee4411..11a4cce 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.1") addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.1") addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.6.1") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.0") From 8c36f662620474811ec7e644d1845f9c061ac113 Mon Sep 17 00:00:00 2001 From: Sam Pillsworth Date: Tue, 7 Nov 2023 16:33:21 -0500 Subject: [PATCH 2/4] default java version is the first one in the list? --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 12f7f5f..53b3a04 100644 --- a/build.sbt +++ b/build.sbt @@ -21,8 +21,8 @@ val scalafixV = "0.11.1" ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.18") ThisBuild / scalaVersion := Scala213 // the default Scala ThisBuild / githubWorkflowJavaVersions := Seq( - JavaSpec.temurin("8"), - JavaSpec.temurin("11") + JavaSpec.temurin("11"), + JavaSpec.temurin("8") ) // semantic db settings From 183f4d59a3cf331b68144989c7d613ea18a0eda8 Mon Sep 17 00:00:00 2001 From: Sam Pillsworth Date: Tue, 7 Nov 2023 19:47:30 -0500 Subject: [PATCH 3/4] githubWorkflowGenerate --- .github/workflows/ci.yml | 98 ++++++++++++++++++++-------------------- build.sbt | 2 +- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a60cf9b..3617f44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,10 +29,10 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13, 2.12] - java: [temurin@8, temurin@11] + java: [temurin@11, temurin@8] exclude: - scala: 2.12 - java: temurin@11 + java: temurin@8 runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: @@ -41,52 +41,52 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - id: setup-java-temurin-8 - if: matrix.java == 'temurin@8' + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: distribution: temurin - java-version: 8 + java-version: 11 cache: sbt - name: sbt update - if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' run: sbt +update - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 + if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 cache: sbt - name: sbt update - if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' run: sbt +update - name: Check that workflows are up to date run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: Check scalafix lints - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' 'scalafixAll --check' - name: Test run: sbt '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' doc - name: Make target directories @@ -111,7 +111,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -119,30 +119,30 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - id: setup-java-temurin-8 - if: matrix.java == 'temurin@8' + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: distribution: temurin - java-version: 8 + java-version: 11 cache: sbt - name: sbt update - if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' run: sbt +update - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 + if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 cache: sbt - name: sbt update - if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' run: sbt +update - name: Download target directories (2.13) @@ -195,7 +195,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -203,30 +203,30 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - id: setup-java-temurin-8 - if: matrix.java == 'temurin@8' + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: distribution: temurin - java-version: 8 + java-version: 11 cache: sbt - name: sbt update - if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' run: sbt +update - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 + if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 cache: sbt - name: sbt update - if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' run: sbt +update - name: Submit Dependencies @@ -240,7 +240,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -248,30 +248,30 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - id: setup-java-temurin-8 - if: matrix.java == 'temurin@8' + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: distribution: temurin - java-version: 8 + java-version: 11 cache: sbt - name: sbt update - if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' run: sbt +update - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 + if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 8 cache: sbt - name: sbt update - if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' run: sbt +update - name: Generate site diff --git a/build.sbt b/build.sbt index 53b3a04..a14d03f 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ val scalafixV = "0.11.1" ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.18") ThisBuild / scalaVersion := Scala213 // the default Scala ThisBuild / githubWorkflowJavaVersions := Seq( - JavaSpec.temurin("11"), + JavaSpec.temurin("11"), // the first java is the default java, don't change the order JavaSpec.temurin("8") ) From 73bfbb235efa5b8952aee5101efb99e899724323 Mon Sep 17 00:00:00 2001 From: Sam Pillsworth Date: Wed, 8 Nov 2023 09:36:52 -0500 Subject: [PATCH 4/4] explicitly set tlJdkRelease --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index a14d03f..dde987e 100644 --- a/build.sbt +++ b/build.sbt @@ -20,6 +20,7 @@ val scalafixV = "0.11.1" ThisBuild / crossScalaVersions := Seq(Scala213, "2.12.18") ThisBuild / scalaVersion := Scala213 // the default Scala +ThisBuild / tlJdkRelease := Some(8) // the JVM to target ThisBuild / githubWorkflowJavaVersions := Seq( JavaSpec.temurin("11"), // the first java is the default java, don't change the order JavaSpec.temurin("8")