From 65a7525b61d88fbf575f68fb1bf3aa6d6169878d Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 03:13:51 +0000 Subject: [PATCH 1/5] Update sbt-typelevel-github-actions to 0.5.0 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index 838e8266..efd8786f 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,2 +1,2 @@ addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2") -addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.4.22") +addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.5.0") From 27e83b30b6245f3f1d3c0d3c61c3f89ab60d8df3 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 03:14:04 +0000 Subject: [PATCH 2/5] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 82 ++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 50 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8b0acda..d2b2e64e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,96 +16,78 @@ on: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +concurrency: + group: ${{ github.workflow }} @ ${{ github.ref }} + cancel-in-progress: true + jobs: build: name: Build and Test strategy: matrix: os: [ubuntu-latest, macos-latest] - scala: [2.12.18] + scala: [2.12] java: [temurin@8, temurin@11, temurin@17, graalvm@17] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 - if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 8 - - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + cache: sbt - - name: Download Java (temurin@11) - id: download-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 11 + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - name: Setup Java (temurin@11) + id: setup-java-temurin-11 if: matrix.java == 'temurin@11' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 11 - jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + cache: sbt - - name: Download Java (temurin@17) - id: download-java-temurin-17 - if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 17 + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Download Java (graalvm@17) - id: download-java-graalvm-17 - if: matrix.java == 'graalvm@17' - uses: typelevel/download-java@v2 - with: - distribution: graalvm - java-version: 17 + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - name: Setup Java (graalvm@17) + id: setup-java-graalvm-17 if: matrix.java == 'graalvm@17' - uses: actions/setup-java@v3 + uses: graalvm/setup-graalvm@v1 with: - distribution: jdkfile + distribution: graalvm java-version: 17 - jdkFile: ${{ steps.download-java-graalvm-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false' + run: sbt +update - name: Check that workflows are up to date run: sbt githubWorkflowCheck From f6f54ac26ea8f12b467d5919b2002d8dacc17acf Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 01:07:32 +0000 Subject: [PATCH 3/5] Update sbt to 1.9.4 --- project/build.properties | 2 +- src/main/g8/project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/build.properties b/project/build.properties index 52413ab7..30409871 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 +sbt.version=1.9.4 diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index 52413ab7..30409871 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 +sbt.version=1.9.4 From 32553639c7e05747cafff109556656be53f2680b Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 01:06:01 +0000 Subject: [PATCH 4/5] Update circe-generic to 0.14.6 --- build.sbt | 2 +- src/main/g8/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index a2faeebb..0bd2730e 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq( ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.23" -val CirceVersion = "0.14.5" +val CirceVersion = "0.14.6" val MunitVersion = "0.7.29" val LogbackVersion = "1.4.11" val MunitCatsEffectVersion = "1.0.7" diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 266707dc..0e413627 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,5 +1,5 @@ val Http4sVersion = "0.23.23" -val CirceVersion = "0.14.5" +val CirceVersion = "0.14.6" val MunitVersion = "0.7.29" val LogbackVersion = "1.4.11" val MunitCatsEffectVersion = "1.0.7" From 719a0fe7a967f3bc6cc5940e6690dd5c8edb5e95 Mon Sep 17 00:00:00 2001 From: Frederick Roth Date: Thu, 31 Aug 2023 15:20:47 +0200 Subject: [PATCH 5/5] Remove support for Java 8 --- .github/workflows/ci.yml | 15 +-------------- README.md | 1 + build.sbt | 1 - 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2b2e64e..66d9ba0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] scala: [2.12] - java: [temurin@8, temurin@11, temurin@17, graalvm@17] + java: [temurin@11, temurin@17, graalvm@17] runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: @@ -37,19 +37,6 @@ jobs: with: fetch-depth: 0 - - 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: 8 - cache: sbt - - - name: sbt update - if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' - run: sbt +update - - name: Setup Java (temurin@11) id: setup-java-temurin-11 if: matrix.java == 'temurin@11' diff --git a/README.md b/README.md index 7eb51f02..35883548 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Generate an http4s service on the ember backend with Circe. 2. Create your project: - Scala 2: `sbt new http4s/http4s.g8` - Scala 3: `sbt new http4s/http4s.g8 --branch 0.23-scala3` + - Java 8: `sbt new http4s/http4s.g8 --branch 0.23-java8` 3. `cd quickstart` 4. `sbt run` 5. `curl http://localhost:8080/hello/$USER` diff --git a/build.sbt b/build.sbt index 0bd2730e..ca988b17 100644 --- a/build.sbt +++ b/build.sbt @@ -20,7 +20,6 @@ val PrimaryOS = "ubuntu-latest" val MacOS = "macos-latest" ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS) ThisBuild / githubWorkflowJavaVersions := Seq( - JavaSpec.temurin("8"), JavaSpec.temurin("11"), JavaSpec.temurin("17"), JavaSpec.graalvm("17")