From d66a3b752646bed93f16c8348476dd5142fb9a0e Mon Sep 17 00:00:00 2001 From: Alessandro Zoffoli <953519+AL333Z@users.noreply.github.com> Date: Sat, 13 Nov 2021 16:45:38 +0100 Subject: [PATCH 01/40] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 81a3137..b941465 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,5 @@ Generate an http4s service on the blaze backend with Circe. 4. `sbt run` 5. `curl http://localhost:8080/hello/$USER` 6. [Learn more](http://http4s.org/) + +You can try out any other supported as well, e.g. `sbt new http4s/http4s-io.g8 --branch 0.23-scala3`. From 18a53e37f5e6c37a48e62dbd44194bca0c862619 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 2 Dec 2021 12:29:25 +0100 Subject: [PATCH 02/40] Update sbt-github-actions to 0.14.2 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index 5b52a25..3456596 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,2 +1,2 @@ addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.13.1") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") From 65eaa24457ab767160ac42a3f36937aec2ff21a9 Mon Sep 17 00:00:00 2001 From: Alessandro Zoffoli Date: Thu, 2 Dec 2021 14:07:26 +0100 Subject: [PATCH 03/40] Update javaspecs --- .github/workflows/ci.yml | 27 ++++++++++++++++++++------- build.sbt | 12 +++++++++--- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f87eaa9..4e6213e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,10 +23,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] scala: [2.12.14] - java: [adopt@1.8, graalvm-ce-java11@] - exclude: - - os: macos-latest - java: adopt@1.8 + java: [temurin@8, temurin@17, graal_20.3.1@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -34,10 +31,26 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 8 + + - name: Setup Java (temurin@17) + if: matrix.java == 'temurin@17' + uses: actions/setup-java@v2 + with: + distribution: temurin + java-version: 17 + + - name: Setup GraalVM (graal_20.3.1@11) + if: matrix.java == 'graal_20.3.1@11' + uses: DeLaGuardo/setup-graalvm@5.0 + with: + graalvm: 20.3.1 + java: java11 - name: Cache sbt uses: actions/cache@v2 diff --git a/build.sbt b/build.sbt index 79cf295..2573472 100644 --- a/build.sbt +++ b/build.sbt @@ -18,11 +18,17 @@ ThisBuild / githubWorkflowBuild := Seq( name = Some("Build native assembly") ) ) -ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8", "graalvm-ce-java11@") -ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-latest") -ThisBuild / githubWorkflowBuildMatrixExclusions := Seq(MatrixExclude(Map("os" -> "macos-latest", "java" -> "adopt@1.8"))) + +val PrimaryOS = "ubuntu-latest" +val MacOS = "macos-latest" +ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS) ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty +val PrimaryJava = JavaSpec.temurin("8") +val LTSJava = JavaSpec.temurin("17") +val GraalVM11 = JavaSpec.graalvm("20.3.1", "11") +ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, GraalVM11) + lazy val root = project.in(file(".")) .settings( name := "http4s-g8", From 552bde5b6248930379a5437d156cb3f85e2c3861 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 21 Dec 2021 04:21:33 +0100 Subject: [PATCH 04/40] Update sbt to 1.5.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 10fd9ee..e64c208 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.5.8 From 6dfe9d63668f51c206f23af8c04571382b435533 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 27 Dec 2021 01:55:03 +0100 Subject: [PATCH 05/40] Update sbt to 1.6.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e64c208..1e70b0c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.8 +sbt.version=1.6.0 From ee5a0757f448f5cdda7ac9d691bf95428f0e3988 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 27 Dec 2021 01:55:39 +0100 Subject: [PATCH 06/40] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e6213e..d9231d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - scala: [2.12.14] + scala: [2.12.15] java: [temurin@8, temurin@17, graal_20.3.1@11] runs-on: ${{ matrix.os }} steps: From bf8a7b86a360ed4b8fdedabc6d05310f5770ce2e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 29 Dec 2021 07:22:07 +0100 Subject: [PATCH 07/40] Update sbt to 1.6.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 1e70b0c..3161d21 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.0 +sbt.version=1.6.1 From 94f857e6539378640e877898074997b757327365 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 9 Jan 2022 10:08:21 +0100 Subject: [PATCH 08/40] Update sbt-giter8 to 0.14.0 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index 3456596..4fd500b 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.13.1") +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.14.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") From 6da9b5044dbd155365b269ca890dbcd1980e622d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 1 Feb 2022 07:49:15 +0100 Subject: [PATCH 09/40] Update sbt to 1.6.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3161d21..c8fcab5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.1 +sbt.version=1.6.2 From f9611e5a6e9c4a72728e474d3576fc66c0b8d5c3 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 10 Sep 2022 20:26:41 +0000 Subject: [PATCH 10/40] Update sbt-giter8 to 0.15.0 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index 4fd500b..c1fdfa6 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.14.0") +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.15.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") From e46e7c04ac98cd245ad98fe7b1dc22e231fc3a6d Mon Sep 17 00:00:00 2001 From: yoshinorin Date: Wed, 21 Sep 2022 02:08:00 +0900 Subject: [PATCH 11/40] docs: update docs URL --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- build.sbt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5b849a1..09d0d2d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,4 +8,4 @@ is a much more limited scope. This template is licensed under CC1.0 license, so please add your name to the bottom of the contributors list in the license file. Opening a pull request signifies your consent to license your contributions under the CC1.0 license. -[contributors' guide]: http://http4s.org/contributing/ +[contributors' guide]: https://http4s.org/contributing/ diff --git a/README.md b/README.md index b941465..ceec00f 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ This template is fixed on `cats.effect.IO`. For a final tagless version, see [h Generate an http4s service on the blaze backend with Circe. -1. [Install sbt](http://www.scala-sbt.org/1.0/docs/Setup.html) +1. [Install sbt](https://www.scala-sbt.org/1.x/docs/Setup.html) 2. `sbt new http4s/http4s-io.g8` 3. `cd quickstart` 4. `sbt run` 5. `curl http://localhost:8080/hello/$USER` -6. [Learn more](http://http4s.org/) +6. [Learn more](https://http4s.org/) You can try out any other supported as well, e.g. `sbt new http4s/http4s-io.g8 --branch 0.23-scala3`. diff --git a/build.sbt b/build.sbt index 2573472..f1bb027 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ // This build is for this Giter8 template. // To test the template run `g8` or `g8Test` from the sbt session. -// See http://www.foundweekends.org/giter8/testing.html#Using+the+Giter8Plugin for more details. +// See https://www.foundweekends.org/giter8/testing.html#Using+the+Giter8Plugin for more details. ThisBuild / githubWorkflowBuild := Seq( WorkflowStep.Sbt( From a642bbba9701dc438bbf3f270b0f4a42fc707a90 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 05:06:46 +0000 Subject: [PATCH 12/40] Update sbt to 1.7.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c8fcab5..563a014 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.2 From cd0f0afe6e3c8f2fb69689675a8d064924a15447 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 3 Oct 2022 05:07:06 +0000 Subject: [PATCH 13/40] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9231d3..ad3af25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - scala: [2.12.15] + scala: [2.12.16] java: [temurin@8, temurin@17, graal_20.3.1@11] runs-on: ${{ matrix.os }} steps: From 217d9d3f2b174742e22e761f4e41f45dc10eb38f Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 4 Oct 2022 08:37:23 +0000 Subject: [PATCH 14/40] Update sbt-giter8 to 0.15.1 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index c1fdfa6..9ea5c03 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.15.0") +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.15.1") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") From 88d597ecd6da72842bc41d6d489bc1be16a5ce19 Mon Sep 17 00:00:00 2001 From: yoshinorin Date: Wed, 21 Sep 2022 01:54:53 +0900 Subject: [PATCH 15/40] Update scala, sbt, dependencies --- .github/workflows/ci.yml | 2 +- src/main/g8/build.sbt | 2 +- src/main/g8/default.properties | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad3af25..91b9c02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - scala: [2.12.16] + scala: [2.13.9] java: [temurin@8, temurin@17, graal_20.3.1@11] runs-on: ${{ matrix.os }} steps: diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 239a834..94970b6 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -23,7 +23,7 @@ lazy val root = (project in file(".")) "org.scalameta" %% "svm-subs" % "20.2.0" $endif$ ), - addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.0" cross CrossVersion.full), + addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full), addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"), testFrameworks += new TestFramework("munit.Framework") ) diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index fdea372..f01a4f4 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -8,11 +8,11 @@ package = $organization$.$name;format="norm,word"$ #http4s_version = maven(org.http4s, http4s-blaze-server_2.12, stable) #logback_version = maven(ch.qos.logback, logback-classic, stable) -scala_version = 2.13.6 -sbt_version = 1.5.5 +scala_version = 2.13.8 +sbt_version = 1.7.1 http4s_version = 0.23.6 -circe_version = 0.14.1 -logback_version = 1.2.6 +circe_version = 0.14.3 +logback_version = 1.4.1 munit_version = 0.7.29 munit_cats_effect_version = 1.0.6 # graal_vm_specific From c0edd4d541b9bfbd8a5cdb0baedc8006673ce5a2 Mon Sep 17 00:00:00 2001 From: yoshinorin Date: Wed, 5 Oct 2022 22:19:40 +0900 Subject: [PATCH 16/40] update scala & sbt version --- src/main/g8/default.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index f01a4f4..36bfac9 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -8,9 +8,9 @@ package = $organization$.$name;format="norm,word"$ #http4s_version = maven(org.http4s, http4s-blaze-server_2.12, stable) #logback_version = maven(ch.qos.logback, logback-classic, stable) -scala_version = 2.13.8 -sbt_version = 1.7.1 http4s_version = 0.23.6 +scala_version = 2.13.9 +sbt_version = 1.7.2 circe_version = 0.14.3 logback_version = 1.4.1 munit_version = 0.7.29 From b7a13006850feb3d5baa444434d28a97cd8ffa13 Mon Sep 17 00:00:00 2001 From: yoshinorin Date: Wed, 5 Oct 2022 22:19:53 +0900 Subject: [PATCH 17/40] update http4s version --- 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 36bfac9..5f457fb 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -8,9 +8,9 @@ package = $organization$.$name;format="norm,word"$ #http4s_version = maven(org.http4s, http4s-blaze-server_2.12, stable) #logback_version = maven(ch.qos.logback, logback-classic, stable) -http4s_version = 0.23.6 scala_version = 2.13.9 sbt_version = 1.7.2 +http4s_version = 0.23.16 circe_version = 0.14.3 logback_version = 1.4.1 munit_version = 0.7.29 From 9c348be8b0636a2004060e55b54e9c657d2ee2ac Mon Sep 17 00:00:00 2001 From: yoshinorin Date: Wed, 5 Oct 2022 22:20:16 +0900 Subject: [PATCH 18/40] specify `scalaVersion` for `githubWorkflowGenerate` --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index f1bb027..383d43f 100644 --- a/build.sbt +++ b/build.sbt @@ -2,6 +2,7 @@ // To test the template run `g8` or `g8Test` from the sbt session. // See https://www.foundweekends.org/giter8/testing.html#Using+the+Giter8Plugin for more details. +ThisBuild / scalaVersion := "2.13.9" ThisBuild / githubWorkflowBuild := Seq( WorkflowStep.Sbt( List("g8Test"), From 9c7830a41bf8e2c78a5bdd6f3c640fd12cc6c769 Mon Sep 17 00:00:00 2001 From: yoshinorin Date: Wed, 5 Oct 2022 22:25:55 +0900 Subject: [PATCH 19/40] downgrade scala version for CI --- .github/workflows/ci.yml | 2 +- build.sbt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91b9c02..ad3af25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - scala: [2.13.9] + scala: [2.12.16] java: [temurin@8, temurin@17, graal_20.3.1@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 383d43f..f1bb027 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,6 @@ // To test the template run `g8` or `g8Test` from the sbt session. // See https://www.foundweekends.org/giter8/testing.html#Using+the+Giter8Plugin for more details. -ThisBuild / scalaVersion := "2.13.9" ThisBuild / githubWorkflowBuild := Seq( WorkflowStep.Sbt( List("g8Test"), From 9faa2315fee4d349d1d1a17f98aa5974bbbd1c94 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 02:36:50 +0000 Subject: [PATCH 20/40] Update sbt to 1.7.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 563a014..6a9f038 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.2 +sbt.version=1.7.3 From 1304edc1dbb18d916f3dc50c783fc71acae2c4a3 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 02:37:10 +0000 Subject: [PATCH 21/40] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad3af25..f07b5c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - scala: [2.12.16] + scala: [2.12.17] java: [temurin@8, temurin@17, graal_20.3.1@11] runs-on: ${{ matrix.os }} steps: From e203ef20067cff16a9d3422a8ce4b24a1519d04d Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 20:23:53 +0000 Subject: [PATCH 22/40] Update sbt-giter8 to 0.16.0 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index 9ea5c03..28aef3f 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.15.1") +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") From 096e3ab9b83ab07c6684500268582f627e2c0f6e Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 20:24:54 +0000 Subject: [PATCH 23/40] Update sbt to 1.8.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 6a9f038..8b9a0b0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.3 +sbt.version=1.8.0 From d27917c70cc252e4d6256044f4e3fde14f29ac54 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 01:45:10 +0000 Subject: [PATCH 24/40] Update sbt-giter8 to 0.16.1 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index 28aef3f..d276f93 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.0") +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.1") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") From bc6189aa11630d4d9be3514e21a4589824dfd646 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 04:22:09 +0000 Subject: [PATCH 25/40] Update sbt-giter8 to 0.16.2 --- project/plugin.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugin.sbt b/project/plugin.sbt index d276f93..1f3e4ff 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.1") +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") From a39d0ab428958d09090a818d26cc2b5060a7720b Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 08:29:12 +0000 Subject: [PATCH 26/40] Update sbt to 1.8.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 8b9a0b0..72413de 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.8.3 From 3ff35decb16a230b02da0b3812300514392ebe5b Mon Sep 17 00:00:00 2001 From: Fred Roth Date: Wed, 14 Jun 2023 13:03:44 +0200 Subject: [PATCH 27/40] Update dependencies and change README.md according to http4s/http4s.g8 --- README.md | 6 +++--- src/main/g8/default.properties | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index ceec00f..7071178 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ This template is fixed on `cats.effect.IO`. For a final tagless version, see [h Generate an http4s service on the blaze backend with Circe. 1. [Install sbt](https://www.scala-sbt.org/1.x/docs/Setup.html) -2. `sbt new http4s/http4s-io.g8` +2. Create your project: + - Scala 2: `sbt new http4s/http4s-io.g8` + - Scala 3: `sbt new http4s/http4s-io.g8 --branch 0.23-scala3` 3. `cd quickstart` 4. `sbt run` 5. `curl http://localhost:8080/hello/$USER` 6. [Learn more](https://http4s.org/) - -You can try out any other supported as well, e.g. `sbt new http4s/http4s-io.g8 --branch 0.23-scala3`. diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 5f457fb..4ff7aff 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -8,13 +8,13 @@ package = $organization$.$name;format="norm,word"$ #http4s_version = maven(org.http4s, http4s-blaze-server_2.12, stable) #logback_version = maven(ch.qos.logback, logback-classic, stable) -scala_version = 2.13.9 -sbt_version = 1.7.2 -http4s_version = 0.23.16 -circe_version = 0.14.3 -logback_version = 1.4.1 +scala_version = 2.13.10 +sbt_version = 1.9.0 +http4s_version = 0.23.20 +circe_version = 0.14.5 +logback_version = 1.4.8 munit_version = 0.7.29 -munit_cats_effect_version = 1.0.6 +munit_cats_effect_version = 1.0.7 # graal_vm_specific graal_native_image = true is_linux_build = false From 6352d9649b8e23893ecf81c3fed168baddc7897b Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 16:32:35 +0000 Subject: [PATCH 28/40] Update sbt to 1.9.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 72413de..3c0b78a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.3 +sbt.version=1.9.1 From 3f9f4c5b21384fe2754df8e3690300d6cff8ee47 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 16:32:52 +0000 Subject: [PATCH 29/40] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f07b5c0..3e8942c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - scala: [2.12.17] + scala: [2.12.18] java: [temurin@8, temurin@17, graal_20.3.1@11] runs-on: ${{ matrix.os }} steps: From 325f4e87eec086ea42b5a55f32382c6026d70260 Mon Sep 17 00:00:00 2001 From: Fred Roth Date: Tue, 27 Jun 2023 09:34:38 +0200 Subject: [PATCH 30/40] Migrate to sbt-typelevel-github-actions --- .github/workflows/ci.yml | 34 ++++++++++++++++++++++++++-------- project/plugin.sbt | 3 ++- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e8942c..45897a2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,24 +27,42 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Setup Java (temurin@8) + - name: Download Java (temurin@8) + id: download-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v2 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 8 - - name: Setup Java (temurin@17) + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v3 + with: + distribution: jdkfile + java-version: 8 + jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + + - name: Download Java (temurin@17) + id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v2 + uses: typelevel/download-java@v2 with: distribution: temurin java-version: 17 + - name: Setup Java (temurin@17) + if: matrix.java == 'temurin@17' + uses: actions/setup-java@v3 + with: + distribution: jdkfile + java-version: 17 + jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + - name: Setup GraalVM (graal_20.3.1@11) if: matrix.java == 'graal_20.3.1@11' uses: DeLaGuardo/setup-graalvm@5.0 @@ -53,7 +71,7 @@ jobs: java: java11 - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -65,10 +83,10 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck + run: sbt githubWorkflowCheck - name: Test generated template - run: sbt ++${{ matrix.scala }} g8Test + run: sbt '++ ${{ matrix.scala }}' g8Test - name: Build native assembly if: startsWith(matrix.java, 'graalvm-') diff --git a/project/plugin.sbt b/project/plugin.sbt index 1f3e4ff..0e8806d 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -1,2 +1,3 @@ addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.4.22") + From dfdf63258de28094fa74e723540219cd7425b3cd Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 02:02:39 +0000 Subject: [PATCH 31/40] Update sbt to 1.9.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3c0b78a..875b706 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.1 +sbt.version=1.9.2 From ad27db179f28c13415b71fb5212dc8da46c25575 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 08:31:17 +0000 Subject: [PATCH 32/40] Update sbt to 1.9.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 875b706..52413ab 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.2 +sbt.version=1.9.3 From ca74358b91f4e6571414c2388828c280ba960ae5 Mon Sep 17 00:00:00 2001 From: Fred Roth Date: Tue, 25 Jul 2023 11:36:01 +0200 Subject: [PATCH 33/40] Remove munit.Framework config Was only needed for sbt <1.5.0 which was released Apr 4, 2021 --- src/main/g8/build.sbt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 94970b6..b6bb545 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -24,6 +24,5 @@ lazy val root = (project in file(".")) $endif$ ), addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full), - addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"), - testFrameworks += new TestFramework("munit.Framework") + addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1") ) From 26aa6300d70a43e3ce25eecdd4a5e01a561291aa Mon Sep 17 00:00:00 2001 From: Fred Roth Date: Tue, 25 Jul 2023 11:37:55 +0200 Subject: [PATCH 34/40] Correction of README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7071178..520502a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This template is fixed on `cats.effect.IO`. For a final tagless version, see [h ## Instructions -Generate an http4s service on the blaze backend with Circe. +Generate an http4s service on the ember backend with Circe. 1. [Install sbt](https://www.scala-sbt.org/1.x/docs/Setup.html) 2. Create your project: From 02d896878062b9fcb92a41df2926adff31dc7450 Mon Sep 17 00:00:00 2001 From: Fred Roth Date: Tue, 25 Jul 2023 11:41:40 +0200 Subject: [PATCH 35/40] Use the same github workflow as http4s.g8 --- .github/workflows/ci.yml | 39 ++++++++++++++++++++++++++++++++------- build.sbt | 13 +++++++------ src/main/g8/build.sbt | 6 +++++- 3 files changed, 44 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45897a2..be62ef4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] scala: [2.12.18] - java: [temurin@8, temurin@17, graal_20.3.1@11] + java: [temurin@8, temurin@11, temurin@17, graalvm@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -47,6 +47,22 @@ jobs: java-version: 8 jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + - 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: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v3 + with: + distribution: jdkfile + java-version: 11 + jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }} + - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' @@ -63,12 +79,21 @@ jobs: java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - - name: Setup GraalVM (graal_20.3.1@11) - if: matrix.java == 'graal_20.3.1@11' - uses: DeLaGuardo/setup-graalvm@5.0 + - name: Download Java (graalvm@11) + id: download-java-graalvm-11 + if: matrix.java == 'graalvm@11' + uses: typelevel/download-java@v2 + with: + distribution: graalvm + java-version: 11 + + - name: Setup Java (graalvm@11) + if: matrix.java == 'graalvm@11' + uses: actions/setup-java@v3 with: - graalvm: 20.3.1 - java: java11 + distribution: jdkfile + java-version: 11 + jdkFile: ${{ steps.download-java-graalvm-11.outputs.jdkFile }} - name: Cache sbt uses: actions/cache@v3 @@ -89,7 +114,7 @@ jobs: run: sbt '++ ${{ matrix.scala }}' g8Test - name: Build native assembly - if: startsWith(matrix.java, 'graalvm-') + if: startsWith(matrix.java, 'graalvm') run: | cd target/sbt-test/http4s-g8/scripted sbt assembly diff --git a/build.sbt b/build.sbt index f1bb027..e665395 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ ThisBuild / githubWorkflowBuild := Seq( "gu install native-image", "cat native-image-readme.md | grep 'native-image -H*' | sh" ), - cond = Some("startsWith(matrix.java, 'graalvm-')"), + cond = Some("startsWith(matrix.java, 'graalvm')"), name = Some("Build native assembly") ) ) @@ -22,13 +22,14 @@ ThisBuild / githubWorkflowBuild := Seq( 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("11") +) ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty -val PrimaryJava = JavaSpec.temurin("8") -val LTSJava = JavaSpec.temurin("17") -val GraalVM11 = JavaSpec.graalvm("20.3.1", "11") -ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, GraalVM11) - lazy val root = project.in(file(".")) .settings( name := "http4s-g8", diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index b6bb545..7316397 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -24,5 +24,9 @@ lazy val root = (project in file(".")) $endif$ ), addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.13.2" cross CrossVersion.full), - addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1") + addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"), + assembly / assemblyMergeStrategy := { + case "module-info.class" => MergeStrategy.discard + case x => (assembly / assemblyMergeStrategy).value.apply(x) + } ) From b8e0950f36a48b3e6389b767ca0ddfa3690fb3e4 Mon Sep 17 00:00:00 2001 From: Fred Roth Date: Tue, 25 Jul 2023 11:44:01 +0200 Subject: [PATCH 36/40] Fix sbt deprecations --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index e665395..916c801 100644 --- a/build.sbt +++ b/build.sbt @@ -33,8 +33,8 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty lazy val root = project.in(file(".")) .settings( name := "http4s-g8", - test in Test := { - val _ = (g8Test in Test).toTask("").value + Test / test := { + val _ = (Test / g8Test).toTask("").value }, scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-XX:ReservedCodeCacheSize=128m", "-Xss2m", "-Dfile.encoding=UTF-8"), resolvers += Resolver.url("typesafe", url("https://repo.typesafe.com/typesafe/ivy-releases/"))(Resolver.ivyStylePatterns), From 481b99569256fa183936f21506740ea24bed434b Mon Sep 17 00:00:00 2001 From: Fred Roth Date: Tue, 25 Jul 2023 11:45:25 +0200 Subject: [PATCH 37/40] Fix typo in comment --- .../main/scala/$package__packaged$/$name__Camel$Server.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/g8/src/main/scala/$package__packaged$/$name__Camel$Server.scala b/src/main/g8/src/main/scala/$package__packaged$/$name__Camel$Server.scala index 111ba32..42fcd52 100644 --- a/src/main/g8/src/main/scala/$package__packaged$/$name__Camel$Server.scala +++ b/src/main/g8/src/main/scala/$package__packaged$/$name__Camel$Server.scala @@ -18,7 +18,7 @@ object $name;format="Camel"$Server { // Combine Service Routes into an HttpApp. // Can also be done via a Router if you - // want to extract a segments not checked + // want to extract segments not checked // in the underlying routes. httpApp = ( $name;format="Camel"$Routes.helloWorldRoutes(helloWorldAlg) <+> From d5404affe018d35fb51099733b0518e83141badf Mon Sep 17 00:00:00 2001 From: Fred Roth Date: Fri, 28 Jul 2023 09:15:05 +0200 Subject: [PATCH 38/40] Update graalvm to 17 to fix build. graal 11 was removed from typelevel/jdk-index in https://github.com/typelevel/jdk-index/pull/197 --- .github/workflows/ci.yml | 18 +++++++++--------- build.sbt | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be62ef4..b8b0acd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] scala: [2.12.18] - java: [temurin@8, temurin@11, temurin@17, graalvm@11] + java: [temurin@8, temurin@11, temurin@17, graalvm@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -79,21 +79,21 @@ jobs: java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - - name: Download Java (graalvm@11) - id: download-java-graalvm-11 - if: matrix.java == 'graalvm@11' + - 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: 11 + java-version: 17 - - name: Setup Java (graalvm@11) - if: matrix.java == 'graalvm@11' + - name: Setup Java (graalvm@17) + if: matrix.java == 'graalvm@17' uses: actions/setup-java@v3 with: distribution: jdkfile - java-version: 11 - jdkFile: ${{ steps.download-java-graalvm-11.outputs.jdkFile }} + java-version: 17 + jdkFile: ${{ steps.download-java-graalvm-17.outputs.jdkFile }} - name: Cache sbt uses: actions/cache@v3 diff --git a/build.sbt b/build.sbt index 916c801..933ce7c 100644 --- a/build.sbt +++ b/build.sbt @@ -26,7 +26,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq( JavaSpec.temurin("8"), JavaSpec.temurin("11"), JavaSpec.temurin("17"), - JavaSpec.graalvm("11") + JavaSpec.graalvm("17") ) ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty From ab2817766e3391aeefff236f1adca3dfe4216931 Mon Sep 17 00:00:00 2001 From: Fred Roth Date: Thu, 3 Aug 2023 11:48:29 +0200 Subject: [PATCH 39/40] Add template dependencies to outer build.sbt to allow scalasteward Based on typelevel/typelevel.g8#14 --- build.sbt | 16 ++++++++++++++++ src/main/g8/build.sbt | 10 +++++----- src/main/g8/default.properties | 12 ------------ src/main/g8/project/build.properties | 2 +- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/build.sbt b/build.sbt index 933ce7c..1ac2ded 100644 --- a/build.sbt +++ b/build.sbt @@ -30,9 +30,25 @@ ThisBuild / githubWorkflowJavaVersions := Seq( ) ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty +val Http4sVersion = "0.23.23" +val CirceVersion = "0.14.5" +val MunitVersion = "0.7.29" +val LogbackVersion = "1.4.8" +val MunitCatsEffectVersion = "1.0.7" + lazy val root = project.in(file(".")) .settings( name := "http4s-g8", + libraryDependencies ++= Seq( + "org.http4s" %% "http4s-ember-server" % Http4sVersion, + "org.http4s" %% "http4s-ember-client" % Http4sVersion, + "org.http4s" %% "http4s-circe" % Http4sVersion, + "org.http4s" %% "http4s-dsl" % Http4sVersion, + "io.circe" %% "circe-generic" % CirceVersion, + "org.scalameta" %% "munit" % MunitVersion % Test, + "org.typelevel" %% "munit-cats-effect-3" % MunitCatsEffectVersion % Test, + "ch.qos.logback" % "logback-classic" % LogbackVersion % Runtime, + ), Test / test := { val _ = (Test / g8Test).toTask("").value }, diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 7316397..6a64cc5 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,8 +1,8 @@ -val Http4sVersion = "$http4s_version$" -val CirceVersion = "$circe_version$" -val MunitVersion = "$munit_version$" -val LogbackVersion = "$logback_version$" -val MunitCatsEffectVersion = "$munit_cats_effect_version$" +val Http4sVersion = "0.23.23" +val CirceVersion = "0.14.5" +val MunitVersion = "0.7.29" +val LogbackVersion = "1.4.8" +val MunitCatsEffectVersion = "1.0.7" lazy val root = (project in file(".")) .settings( diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 4ff7aff..84b75bb 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -2,19 +2,7 @@ name = quickstart organization = com.example package = $organization$.$name;format="norm,word"$ -# Use these after https://github.com/sbt/sbt-giter8-resolver/pull/8 -#scala_version = maven(org.scala-lang, scala-library, stable) -#sbt_version = maven(org.scala-sbt, sbt, stable) -#http4s_version = maven(org.http4s, http4s-blaze-server_2.12, stable) -#logback_version = maven(ch.qos.logback, logback-classic, stable) - scala_version = 2.13.10 -sbt_version = 1.9.0 -http4s_version = 0.23.20 -circe_version = 0.14.5 -logback_version = 1.4.8 -munit_version = 0.7.29 -munit_cats_effect_version = 1.0.7 # graal_vm_specific graal_native_image = true is_linux_build = false diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index e68d0d7..91550e8 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=$sbt_version$ +sbt.version=1.9.3 From 7532949321e2021e6a286a3da7d5542ffceba8cd Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sat, 5 Aug 2023 12:32:56 +0000 Subject: [PATCH 40/40] Update logback-classic to 1.4.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 1ac2ded..472275c 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty val Http4sVersion = "0.23.23" val CirceVersion = "0.14.5" val MunitVersion = "0.7.29" -val LogbackVersion = "1.4.8" +val LogbackVersion = "1.4.9" val MunitCatsEffectVersion = "1.0.7" lazy val root = project.in(file(".")) diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 6a64cc5..7c8ca14 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,7 +1,7 @@ val Http4sVersion = "0.23.23" val CirceVersion = "0.14.5" val MunitVersion = "0.7.29" -val LogbackVersion = "1.4.8" +val LogbackVersion = "1.4.9" val MunitCatsEffectVersion = "1.0.7" lazy val root = (project in file("."))