From 0412b7f13d2146806f18e45a3b40f2f30835ceae Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:23:19 +0000 Subject: [PATCH 01/22] Update munit to 1.0.1 --- 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 f0a85f4..bd80f11 100644 --- a/build.sbt +++ b/build.sbt @@ -31,7 +31,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.27" val CirceVersion = "0.14.9" -val MunitVersion = "1.0.0" +val MunitVersion = "1.0.1" val LogbackVersion = "1.5.6" val MunitCatsEffectVersion = "2.0.0" diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 3f71ca5..e3fb40d 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,6 +1,6 @@ val Http4sVersion = "0.23.27" val CirceVersion = "0.14.9" -val MunitVersion = "1.0.0" +val MunitVersion = "1.0.1" val LogbackVersion = "1.5.6" val MunitCatsEffectVersion = "2.0.0" From 8adb1686aaa4304e3627a422ae9187588b158a4a Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 20:18:48 +0000 Subject: [PATCH 02/22] Update logback-classic to 1.5.7 --- 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 bd80f11..c476c32 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.27" val CirceVersion = "0.14.9" val MunitVersion = "1.0.1" -val LogbackVersion = "1.5.6" +val LogbackVersion = "1.5.7" val MunitCatsEffectVersion = "2.0.0" lazy val root = project.in(file(".")) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index e3fb40d..c4f5696 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,7 +1,7 @@ val Http4sVersion = "0.23.27" val CirceVersion = "0.14.9" val MunitVersion = "1.0.1" -val LogbackVersion = "1.5.6" +val LogbackVersion = "1.5.7" val MunitCatsEffectVersion = "2.0.0" lazy val root = (project in file(".")) From 39656c4ce2b648fc2945541870ad5bcbff1ef201 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 12:35:14 +0000 Subject: [PATCH 03/22] Update sbt-tpolecat to 0.5.2 --- build.sbt | 2 +- src/main/g8/project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index c476c32..20e1dae 100644 --- a/build.sbt +++ b/build.sbt @@ -48,7 +48,7 @@ lazy val root = project.in(file(".")) "org.typelevel" %% "munit-cats-effect" % MunitCatsEffectVersion % Test, "ch.qos.logback" % "logback-classic" % LogbackVersion % Runtime, ), - addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1"), + addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2"), addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0"), addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0"), Test / test := { diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt index 5bfe86c..a0c7785 100644 --- a/src/main/g8/project/plugins.sbt +++ b/src/main/g8/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1") +addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2") addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") From 8a6101a1800668a109b7495e652f4d22cf61fdc0 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 11:10:52 +0000 Subject: [PATCH 04/22] Update logback-classic to 1.5.8 --- 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 20e1dae..06293a2 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.27" val CirceVersion = "0.14.9" val MunitVersion = "1.0.1" -val LogbackVersion = "1.5.7" +val LogbackVersion = "1.5.8" val MunitCatsEffectVersion = "2.0.0" lazy val root = project.in(file(".")) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index c4f5696..77fb430 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,7 +1,7 @@ val Http4sVersion = "0.23.27" val CirceVersion = "0.14.9" val MunitVersion = "1.0.1" -val LogbackVersion = "1.5.7" +val LogbackVersion = "1.5.8" val MunitCatsEffectVersion = "2.0.0" lazy val root = (project in file(".")) From f5e7ea62d32f61375f3c4bd6b349f206d03f5f45 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 11:10:55 +0000 Subject: [PATCH 05/22] Update sbt-typelevel-github-actions to 0.7.3 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index d1182c8..e5699f0 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,3 +1,3 @@ addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2") -addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.3") From 05881dacca37c70283aec7a7b0f9ca4d1b47f0f5 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 00:43:16 +0000 Subject: [PATCH 06/22] Update http4s-circe, http4s-dsl, ... to 0.23.28 --- 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 20e1dae..dd8b62c 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq( ) ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty -val Http4sVersion = "0.23.27" +val Http4sVersion = "0.23.28" val CirceVersion = "0.14.9" val MunitVersion = "1.0.1" val LogbackVersion = "1.5.7" diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index c4f5696..0271a81 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,4 +1,4 @@ -val Http4sVersion = "0.23.27" +val Http4sVersion = "0.23.28" val CirceVersion = "0.14.9" val MunitVersion = "1.0.1" val LogbackVersion = "1.5.7" From 867f21d7f8a2c0fec1e2756058322c9738d18237 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 20:11:44 +0000 Subject: [PATCH 07/22] Update circe-generic to 0.14.10 --- 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 dd8b62c..e39b5d8 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq( ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.28" -val CirceVersion = "0.14.9" +val CirceVersion = "0.14.10" val MunitVersion = "1.0.1" val LogbackVersion = "1.5.7" val MunitCatsEffectVersion = "2.0.0" diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 0271a81..1f436f4 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,5 +1,5 @@ val Http4sVersion = "0.23.28" -val CirceVersion = "0.14.9" +val CirceVersion = "0.14.10" val MunitVersion = "1.0.1" val LogbackVersion = "1.5.7" val MunitCatsEffectVersion = "2.0.0" From 76e7c8e6233f9415c4e456d6a18813f1446df615 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 00:48:17 +0000 Subject: [PATCH 08/22] Update sbt to 1.10.2 --- 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 ee4c672..0b699c3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index 74d800f..a1ff42a 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 From dcd57402e6540f44744efc2abe8f6d974a4f6aa3 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:19:46 +0000 Subject: [PATCH 09/22] Update munit to 1.0.2 --- 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 bc74771..85c1c39 100644 --- a/build.sbt +++ b/build.sbt @@ -31,7 +31,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" -val MunitVersion = "1.0.1" +val MunitVersion = "1.0.2" val LogbackVersion = "1.5.8" val MunitCatsEffectVersion = "2.0.0" diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 7cb161d..6b56059 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,6 +1,6 @@ val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" -val MunitVersion = "1.0.1" +val MunitVersion = "1.0.2" val LogbackVersion = "1.5.8" val MunitCatsEffectVersion = "2.0.0" From caa01e215a41efe0defc96a72119d8880bf77494 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 00:46:33 +0000 Subject: [PATCH 10/22] Update sbt-assembly to 2.3.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index bc74771..93ac79e 100644 --- a/build.sbt +++ b/build.sbt @@ -50,7 +50,7 @@ lazy val root = project.in(file(".")) ), addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2"), addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0"), - addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0"), + addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0"), Test / test := { val _ = (Test / g8Test).toTask("").value }, From 7e5090112ed07853de276165328ac862184f5b77 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:12:48 +0000 Subject: [PATCH 11/22] Update logback-classic to 1.5.9 --- 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 4beabc4..be226db 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" -val LogbackVersion = "1.5.8" +val LogbackVersion = "1.5.9" val MunitCatsEffectVersion = "2.0.0" lazy val root = project.in(file(".")) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 6b56059..6e6282c 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,7 +1,7 @@ val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" -val LogbackVersion = "1.5.8" +val LogbackVersion = "1.5.9" val MunitCatsEffectVersion = "2.0.0" lazy val root = (project in file(".")) From 17bb05b9076cd8c7e1b8de08f2df40e6a2f83400 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 00:46:55 +0000 Subject: [PATCH 12/22] Update sbt-typelevel-github-actions to 0.7.4 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index e5699f0..04fd6e6 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,3 +1,3 @@ addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2") -addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.3") +addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.4") From 0f06869704ccde0c92810b5cac7040c2b848ca1d Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 00:47:05 +0000 Subject: [PATCH 13/22] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25fc62a..4af595d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,8 +33,7 @@ jobs: timeout-minutes: 60 steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -70,7 +69,7 @@ jobs: - name: Setup Java (graalvm@17) id: setup-java-graalvm-17 if: matrix.java == 'graalvm@17' - uses: graalvm/setup-graalvm@v1 + uses: actions/setup-java@v4 with: distribution: graalvm java-version: 17 From 32c2932b46891527e321384b50626a61bed36965 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 12:16:51 +0000 Subject: [PATCH 14/22] Update logback-classic to 1.5.10 --- 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 be226db..ac83aca 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" -val LogbackVersion = "1.5.9" +val LogbackVersion = "1.5.10" val MunitCatsEffectVersion = "2.0.0" lazy val root = project.in(file(".")) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 6e6282c..ce08834 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,7 +1,7 @@ val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" -val LogbackVersion = "1.5.9" +val LogbackVersion = "1.5.10" val MunitCatsEffectVersion = "2.0.0" lazy val root = (project in file(".")) From 6813a3863b1f1e94b4bfd6c7fdd509355723e9fa Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 12:18:31 +0000 Subject: [PATCH 15/22] Update logback-classic to 1.5.11 --- 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 ac83aca..65411ca 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" -val LogbackVersion = "1.5.10" +val LogbackVersion = "1.5.11" val MunitCatsEffectVersion = "2.0.0" lazy val root = project.in(file(".")) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index ce08834..4c04e63 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,7 +1,7 @@ val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" -val LogbackVersion = "1.5.10" +val LogbackVersion = "1.5.11" val MunitCatsEffectVersion = "2.0.0" lazy val root = (project in file(".")) From 6c5db5a3f5da18b6c439c247c44c3083db3afed8 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:13:07 +0000 Subject: [PATCH 16/22] Update http4s-circe, http4s-dsl, ... to 0.23.29 --- 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 65411ca..e4394fc 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq( ) ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty -val Http4sVersion = "0.23.28" +val Http4sVersion = "0.23.29" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" val LogbackVersion = "1.5.11" diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 4c04e63..f024af9 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,4 +1,4 @@ -val Http4sVersion = "0.23.28" +val Http4sVersion = "0.23.29" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" val LogbackVersion = "1.5.11" From e67547b2aed36e3186ef9365c7137316e7b973ed Mon Sep 17 00:00:00 2001 From: Frederick Roth Date: Wed, 23 Oct 2024 19:19:06 +0200 Subject: [PATCH 17/22] Remove support for graal --- .github/workflows/ci.yml | 23 +-- build.sbt | 13 +- ...mage.truthy)$native-image-readme.md$endif$ | 6 - src/main/g8/build.sbt | 5 +- src/main/g8/default.properties | 4 - .../$package__packaged$/reflect-config.json | 180 ------------------ 6 files changed, 3 insertions(+), 228 deletions(-) delete mode 100644 src/main/g8/$if(graal_native_image.truthy)$native-image-readme.md$endif$ delete mode 100644 src/main/g8/src/main/resources/$if(graal_native_image.truthy)$META-INF$endif$/native-image/$package__packaged$/reflect-config.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4af595d..83e03da 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@11, temurin@17, graalvm@17] + java: [temurin@11, temurin@17] runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: @@ -66,29 +66,8 @@ jobs: 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@v4 - with: - distribution: graalvm - java-version: 17 - cache: sbt - - - 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 - name: Test generated template run: sbt '++ ${{ matrix.scala }}' g8Test - - - name: Build native assembly - if: startsWith(matrix.java, 'graalvm') - run: | - cd target/sbt-test/http4s-g8/scripted - sbt assembly - gu install native-image - cat native-image-readme.md | grep 'native-image -H*' | sh diff --git a/build.sbt b/build.sbt index 65411ca..f4c5543 100644 --- a/build.sbt +++ b/build.sbt @@ -6,16 +6,6 @@ ThisBuild / githubWorkflowBuild := Seq( WorkflowStep.Sbt( List("g8Test"), name = Some("Test generated template") - ), - WorkflowStep.Run( - List( - "cd target/sbt-test/http4s-g8/scripted", - "sbt assembly", - "gu install native-image", - "cat native-image-readme.md | grep 'native-image -H*' | sh" - ), - cond = Some("startsWith(matrix.java, 'graalvm')"), - name = Some("Build native assembly") ) ) @@ -24,8 +14,7 @@ val MacOS = "macos-latest" ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS) ThisBuild / githubWorkflowJavaVersions := Seq( JavaSpec.temurin("11"), - JavaSpec.temurin("17"), - JavaSpec.graalvm("17") + JavaSpec.temurin("17") ) ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty diff --git a/src/main/g8/$if(graal_native_image.truthy)$native-image-readme.md$endif$ b/src/main/g8/$if(graal_native_image.truthy)$native-image-readme.md$endif$ deleted file mode 100644 index e022957..0000000 --- a/src/main/g8/$if(graal_native_image.truthy)$native-image-readme.md$endif$ +++ /dev/null @@ -1,6 +0,0 @@ -You can build a native-image binary as mentioned in the http4s deployment [section] (https://github.com/drocsid/http4s/blob/docs/deployment/docs/src/main/tut/deployment.md) . You will need to follow the directions there to provide GraalVM / native-image plugin and provide a muslC bundle. Then populate the UseMuslC path with it's location. - -``` -native-image $if(is_linux_build.truthy)$--static -H:UseMuslC="/path.to/muslC"$endif$ -H:+ReportExceptionStackTraces -H:+AddAllCharsets --allow-incomplete-classpath --no-fallback --initialize-at-build-time --enable-http --enable-https --enable-all-security-services --verbose -jar "./target/$scala_assembly_target$/$name$-assembly-0.0.1-SNAPSHOT.jar" $name$BinaryImage -``` - diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 4c04e63..518d41c 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -18,10 +18,7 @@ lazy val root = (project in file(".")) "io.circe" %% "circe-generic" % CirceVersion, "org.scalameta" %% "munit" % MunitVersion % Test, "org.typelevel" %% "munit-cats-effect" % MunitCatsEffectVersion % Test, - "ch.qos.logback" % "logback-classic" % LogbackVersion, - $if(graal_native_image.truthy)$ - "org.scalameta" % "svm-subs" % "101.0.0" - $endif$ + "ch.qos.logback" % "logback-classic" % LogbackVersion ), addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full), addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"), diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 00691a5..6dd6389 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -3,7 +3,3 @@ organization = com.example package = $organization$.$name;format="norm,word"$ scala_version = 2.13.14 -# graal_vm_specific -graal_native_image = true -is_linux_build = false -scala_assembly_target = scala-2.13 diff --git a/src/main/g8/src/main/resources/$if(graal_native_image.truthy)$META-INF$endif$/native-image/$package__packaged$/reflect-config.json b/src/main/g8/src/main/resources/$if(graal_native_image.truthy)$META-INF$endif$/native-image/$package__packaged$/reflect-config.json deleted file mode 100644 index d297bd6..0000000 --- a/src/main/g8/src/main/resources/$if(graal_native_image.truthy)$META-INF$endif$/native-image/$package__packaged$/reflect-config.json +++ /dev/null @@ -1,180 +0,0 @@ -[ - { - "name": "org.slf4j.impl.StaticLoggerBinder", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.DateConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.MessageConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.ThrowableProxyConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.NopThrowableInformationConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.ContextNameConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.BoldYellowCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.LoggerConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.ReplacingCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.BoldBlueCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.CyanCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.RedCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.WhiteCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.PropertyConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.RootCauseFirstThrowableProxyConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.MethodOfCallerConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.LevelConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.IdentityCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.BoldWhiteCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.MarkerConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.BoldCyanCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.BoldMagentaCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.RelativeTimeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.MagentaCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.ClassOfCallerConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.LineOfCallerConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.FileOfCallerConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.BoldGreenCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.LocalSequenceNumberConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.YellowCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.color.HighlightingCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.GrayCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.MDCConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.ClassOfCallerConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.BoldRedCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.GreenCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.pattern.color.BlackCompositeConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.ThreadConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.pattern.LineSeparatorConverter", - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.classic.encoder.PatternLayoutEncoder", - "allPublicMethods":true, - "allDeclaredConstructors": true - }, - { - "name": "ch.qos.logback.core.ConsoleAppender", - "allPublicMethods":true, - "allDeclaredConstructors": true - }, - { - "name": "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl", - "allDeclaredConstructors": true - } -] From 235df440ec6f4bcd9816c999d761d5a2c0f63f02 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:43:59 +0000 Subject: [PATCH 18/22] Update logback-classic to 1.5.12 --- 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 65411ca..9b59547 100644 --- a/build.sbt +++ b/build.sbt @@ -32,7 +32,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" -val LogbackVersion = "1.5.11" +val LogbackVersion = "1.5.12" val MunitCatsEffectVersion = "2.0.0" lazy val root = project.in(file(".")) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 4c04e63..a4b6c3e 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,7 +1,7 @@ val Http4sVersion = "0.23.28" val CirceVersion = "0.14.10" val MunitVersion = "1.0.2" -val LogbackVersion = "1.5.11" +val LogbackVersion = "1.5.12" val MunitCatsEffectVersion = "2.0.0" lazy val root = (project in file(".")) From 95dfe36600951bdcff8f4bf4604162d174f7eaf2 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 12:22:38 +0000 Subject: [PATCH 19/22] Update sbt to 1.10.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 0b699c3..09feeee 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.4 diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index a1ff42a..3769c4a 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.10.2 +sbt.version=1.10.4 From 66d9fba4ebfe5899970a1711e468a700752c4967 Mon Sep 17 00:00:00 2001 From: Frederick Roth Date: Mon, 28 Oct 2024 21:43:47 +0100 Subject: [PATCH 20/22] Update Scala version to fix build --- src/main/g8/default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 6dd6389..9e45043 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -2,4 +2,4 @@ name = quickstart organization = com.example package = $organization$.$name;format="norm,word"$ -scala_version = 2.13.14 +scala_version = 2.13.15 From 328e257acc8e043d322208f8533adbdaea8992b0 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 00:49:57 +0000 Subject: [PATCH 21/22] Update sbt to 1.10.5 --- 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 09feeee..db1723b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.4 +sbt.version=1.10.5 diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index 3769c4a..30c85e4 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.10.4 +sbt.version=1.10.5 From 4c047427d41bc3e965bc2fbc6ba19640d62df2a1 Mon Sep 17 00:00:00 2001 From: Frederick Roth Date: Mon, 4 Nov 2024 13:56:37 +0100 Subject: [PATCH 22/22] Remove Scala version from default.properties --- src/main/g8/build.sbt | 2 +- src/main/g8/default.properties | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 7b160e0..3574aaa 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -9,7 +9,7 @@ lazy val root = (project in file(".")) organization := "$organization$", name := "$name;format="norm"$", version := "0.0.1-SNAPSHOT", - scalaVersion := "$scala_version$", + scalaVersion := "2.13.15", libraryDependencies ++= Seq( "org.http4s" %% "http4s-ember-server" % Http4sVersion, "org.http4s" %% "http4s-ember-client" % Http4sVersion, diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 9e45043..d5f5423 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -2,4 +2,3 @@ name = quickstart organization = com.example package = $organization$.$name;format="norm,word"$ -scala_version = 2.13.15