From 8517e6ddddf2e68bdd48d9f3cfac1271c83eeefd 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:22:33 +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 8840578..a124f39 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,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 573c080..decb0ab 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 0988df9795d77197b70ea604c4e65497bce0f014 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:30 +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 a124f39..171c336 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,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 diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index decb0ab..23f8bd0 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 06a39190fb52b280b164cd28d21aba290daf2558 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:34:55 +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 171c336..13e76d6 100644 --- a/build.sbt +++ b/build.sbt @@ -46,7 +46,7 @@ lazy val root = project "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 e8b42c0..d78c92a 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.10.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") From 9c32cc4a5cc59551654322cbd44dba46f05a9836 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:04:09 +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 13e76d6..fcfab7d 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,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 diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 23f8bd0..54ca1b7 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 887dbb8b0412e319028a5877061dfb6ae7ddbc96 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:04:20 +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 0f2d6d4..88b6f1c 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.7.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.3") From 1875fe70034d54532363f2b5c19a83a452333460 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:42:30 +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 13e76d6..a784f4f 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,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 23f8bd0..e6a0b8e 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 84f9d027cedb8298ccbeb402396ee5b4f035d5b1 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:14 +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 a784f4f..ecad4a7 100644 --- a/build.sbt +++ b/build.sbt @@ -27,7 +27,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 e6a0b8e..2445b78 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 258768688d5a1902d4f5d875ecfee31fcd9322bf 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:46:01 +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 ee4c672..0b699c3 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 From ee7065d97c351099c4e0160d20c7a45829174115 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:15 +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 946546e..4db0b5f 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,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 b5b9fbe..5f33025 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 8f347e54a5f7f09e4703684fbdf8b864bf112e0a 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:17 +0000 Subject: [PATCH 10/22] Update sbt-assembly to 2.3.0 --- 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 946546e..126eecc 100644 --- a/build.sbt +++ b/build.sbt @@ -48,7 +48,7 @@ lazy val root = project ), 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 }, diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt index d78c92a..6e0e8d9 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.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") From e468efaa5b6335247e12bb3a159c11c7329f6fb6 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:15 +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 e967ff6..e4518ac 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,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 diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 5f33025..b9d7474 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 d9f8dff7604b3516df708217eae8542642901e86 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:44:05 +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 88b6f1c..3bf1d8e 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.7.3") +addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.4") From acbed9bbfbf31e736afcbe05f5665ae42c1a9494 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:44:25 +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 731c2308ccf7030c7f7e8d13e89418eeafb8e7bd 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:09 +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 e4518ac..1869054 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,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 diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index b9d7474..ec15705 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 d9a41cc95b7d6ca27690c4b99bd62fe26a574981 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:01 +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 1869054..b645493 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,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 diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index ec15705..7c2fc32 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 3ed45cc9658dbf34507baf6e1cc8b2c02c6509f9 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:12:16 +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 b645493..c2b6f15 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,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 7c2fc32..973fd6a 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 ac7ec63d48fb7b38ba4b4705e225372dd3659355 Mon Sep 17 00:00:00 2001 From: Frederick Roth Date: Wed, 23 Oct 2024 19:14:23 +0200 Subject: [PATCH 17/22] Remove support for graalvm --- .github/workflows/ci.yml | 23 +-- build.sbt | 11 -- ...mage.truthy)$native-image-readme.md$endif$ | 6 - src/main/g8/build.sbt | 3 - src/main/g8/default.properties | 4 - .../$package__packaged$/reflect-config.json | 180 ------------------ 6 files changed, 1 insertion(+), 226 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 b645493..63db18f 100644 --- a/build.sbt +++ b/build.sbt @@ -4,16 +4,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") - ) ) val PrimaryOS = "ubuntu-latest" @@ -22,7 +12,6 @@ ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS) ThisBuild / githubWorkflowJavaVersions := Seq( JavaSpec.temurin("11"), JavaSpec.temurin("17"), - JavaSpec.graalvm("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 7c2fc32..9bf3b96 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -19,9 +19,6 @@ lazy val root = (project in file(".")) "org.scalameta" %% "munit" % MunitVersion % Test, "org.typelevel" %% "munit-cats-effect" % MunitCatsEffectVersion % Test, "ch.qos.logback" % "logback-classic" % LogbackVersion % Runtime, - $if(graal_native_image.truthy)$ - "org.scalameta" % "svm-subs" % "101.0.0" - $endif$ ), 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 856e343ca8b4ccb14d4d6c89d7e559764bde7796 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:34 +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 b645493..14a1b0d 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,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 diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 7c2fc32..4fd9d0a 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 828a4220cbc2ccbb429bea4fd2e2116f09aecbcb 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:19:54 +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 0b699c3..09feeee 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.4 From 6b94da07424065022c279a91a0eabd1a06206298 Mon Sep 17 00:00:00 2001 From: Frederick Roth Date: Mon, 28 Oct 2024 21:41:00 +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 24a3ab9e313c74e8ca7c1078ee493c2c76c98f39 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:47:41 +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 09feeee..db1723b 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.4 +sbt.version=1.10.5 From a630ea325bb10702ee87b45dbed2fc6aa6626b0a Mon Sep 17 00:00:00 2001 From: Frederick Roth Date: Mon, 4 Nov 2024 13:59:36 +0100 Subject: [PATCH 22/22] Remove scala version from default.properties --- src/main/g8/build.sbt | 2 +- src/main/g8/default.properties | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index d3d99ae..1f9f6d1 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..e4b678d 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -1,5 +1,3 @@ name = quickstart organization = com.example package = $organization$.$name;format="norm,word"$ - -scala_version = 2.13.15