From 6b339908a1ecb1c7acfe9b3607e6f5d5462d2bbf Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 8 Jul 2022 16:39:01 +0000 Subject: [PATCH 01/20] Update fs2-core to 3.2.10 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 501c97d4..3a431d48 100644 --- a/build.sbt +++ b/build.sbt @@ -121,7 +121,7 @@ ThisBuild / Test / jsEnv := { } val catsEffectVersion = "3.3.13" -val fs2Version = "3.2.9" +val fs2Version = "3.2.10" val http4sVersion = buildinfo.BuildInfo.http4sVersion // share version with build project val scalaJSDomVersion = "2.2.0" val circeVersion = "0.14.2" From 4660c7d5ebb17ea2dd6b69546ce1c6afb2ca9b92 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 10 Jul 2022 20:26:25 +0000 Subject: [PATCH 02/20] Update sbt to 1.7.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c8fcab54..5b12c1dc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.7.0 From ebaaa8c53f7125dd448eeb7612d383f73d1cd036 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 05:09:14 +0000 Subject: [PATCH 03/20] Update sbt to 1.7.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 5b12c1dc..22af2628 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.0 +sbt.version=1.7.1 From 2273e3df685288446f17c30ae3067154fb225bdd Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Tue, 12 Jul 2022 14:05:45 +0000 Subject: [PATCH 04/20] Setup bundle-size-test project --- .github/workflows/ci.yml | 4 +-- build.sbt | 17 +++++++++++-- bundle-size-test/src/main/scala/Main.scala | 29 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 bundle-size-test/src/main/scala/Main.scala diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf5840de..8e483da1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,11 +110,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.2') - run: mkdir -p target site/target tests/target dom/target tests-nodejs/target jsdocs/target project/target + run: mkdir -p target site/target tests/target dom/target tests-nodejs/target bundle-size-test/target jsdocs/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.2') - run: tar cf targets.tar target site/target tests/target dom/target tests-nodejs/target jsdocs/target project/target + run: tar cf targets.tar target site/target tests/target dom/target tests-nodejs/target bundle-size-test/target jsdocs/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.2') diff --git a/build.sbt b/build.sbt index 3a431d48..811acdea 100644 --- a/build.sbt +++ b/build.sbt @@ -128,8 +128,10 @@ val circeVersion = "0.14.2" val munitVersion = "0.7.29" val munitCEVersion = "1.0.7" -lazy val root = - project.in(file(".")).aggregate(dom, tests, nodeJSTests).enablePlugins(NoPublishPlugin) +lazy val root = project + .in(file(".")) + .aggregate(dom, tests, nodeJSTests, bundleSizeTest) + .enablePlugins(NoPublishPlugin) lazy val dom = project .in(file("dom")) @@ -194,6 +196,17 @@ lazy val nodeJSTests = project .dependsOn(dom) .enablePlugins(ScalaJSPlugin, NoPublishPlugin) +lazy val bundleSizeTest = project + .in(file("bundle-size-test")) + .settings( + scalaJSUseMainModuleInitializer := true, + libraryDependencies ++= Seq( + "org.http4s" %%% "http4s-circe" % http4sVersion + ) + ) + .dependsOn(dom) + .enablePlugins(ScalaJSPlugin, NoPublishPlugin) + lazy val jsdocs = project .dependsOn(dom) diff --git a/bundle-size-test/src/main/scala/Main.scala b/bundle-size-test/src/main/scala/Main.scala new file mode 100644 index 00000000..9af81f92 --- /dev/null +++ b/bundle-size-test/src/main/scala/Main.scala @@ -0,0 +1,29 @@ +/* + * Copyright 2021 http4s.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import cats.effect._ +import cats.effect.unsafe.implicits._ +import io.circe._ +import org.http4s.circe._ +import org.http4s.client._ +import org.http4s.dom._ + +object Main { + val client: Client[IO] = FetchClientBuilder[IO].create + + def main(args: Array[String]): Unit = + client.expect[Json]("https://api.github.com/repos/http4s/http4s").unsafeRunAndForget() +} From 2cfe30505386785a5883bfad6b07e8c0f923ce79 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 02:12:42 +0000 Subject: [PATCH 05/20] Update cats-effect to 3.3.14 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3a431d48..387d5186 100644 --- a/build.sbt +++ b/build.sbt @@ -120,7 +120,7 @@ ThisBuild / Test / jsEnv := { } } -val catsEffectVersion = "3.3.13" +val catsEffectVersion = "3.3.14" val fs2Version = "3.2.10" val http4sVersion = buildinfo.BuildInfo.http4sVersion // share version with build project val scalaJSDomVersion = "2.2.0" From 4f922fdf9db9c34b6841e0b7310a69f7a835eb08 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 17 Jul 2022 02:26:03 +0000 Subject: [PATCH 06/20] Update sbt-http4s-org to 0.14.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b838f0b8..41b595c6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1" libraryDependencies += "org.http4s" %% "http4s-dsl" % http4sVersion libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.12" -addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.3") +addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.4") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") From ba0a60055f4510d524b63a72d04f093c42a5324e Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 18 Jul 2022 19:33:34 +0000 Subject: [PATCH 07/20] Setup sbt-bundlemon --- .github/workflows/ci.yml | 8 ++++++-- .../src/main/scala/Main.scala | 0 build.sbt | 19 ++++++++++++++----- project/plugins.sbt | 1 + 4 files changed, 21 insertions(+), 7 deletions(-) rename {bundle-size-test => artifact-size-test}/src/main/scala/Main.scala (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e483da1..243a95af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,6 +100,10 @@ jobs: if: matrix.java == 'temurin@8' run: 'sbt ''++${{ matrix.scala }}'' ''set Global / useJSEnv := JSEnv.${{ matrix.jsenv }}'' doc' + - name: Monitor artifact size + if: matrix.jsenv == 'Chrome' + run: 'sbt ''++${{ matrix.scala }}'' ''set Global / useJSEnv := JSEnv.${{ matrix.jsenv }}'' aftifactSizeTest/bundleMon' + - name: Check scalafix lints if: matrix.java == 'temurin@8' && !startsWith(matrix.scala, '3.') run: 'sbt ''++${{ matrix.scala }}'' ''set Global / useJSEnv := JSEnv.${{ matrix.jsenv }}'' ''scalafixAll --check''' @@ -110,11 +114,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.2') - run: mkdir -p target site/target tests/target dom/target tests-nodejs/target bundle-size-test/target jsdocs/target project/target + run: mkdir -p target site/target tests/target dom/target artifact-size-test/target tests-nodejs/target jsdocs/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.2') - run: tar cf targets.tar target site/target tests/target dom/target tests-nodejs/target bundle-size-test/target jsdocs/target project/target + run: tar cf targets.tar target site/target tests/target dom/target artifact-size-test/target tests-nodejs/target jsdocs/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.2') diff --git a/bundle-size-test/src/main/scala/Main.scala b/artifact-size-test/src/main/scala/Main.scala similarity index 100% rename from bundle-size-test/src/main/scala/Main.scala rename to artifact-size-test/src/main/scala/Main.scala diff --git a/build.sbt b/build.sbt index 811acdea..9d0418da 100644 --- a/build.sbt +++ b/build.sbt @@ -130,7 +130,7 @@ val munitCEVersion = "1.0.7" lazy val root = project .in(file(".")) - .aggregate(dom, tests, nodeJSTests, bundleSizeTest) + .aggregate(dom, tests, nodeJSTests, artifactSizeTest) .enablePlugins(NoPublishPlugin) lazy val dom = project @@ -196,16 +196,25 @@ lazy val nodeJSTests = project .dependsOn(dom) .enablePlugins(ScalaJSPlugin, NoPublishPlugin) -lazy val bundleSizeTest = project - .in(file("bundle-size-test")) +lazy val artifactSizeTest = project + .in(file("artifact-size-test")) .settings( scalaJSUseMainModuleInitializer := true, libraryDependencies ++= Seq( "org.http4s" %%% "http4s-circe" % http4sVersion - ) + ), + bundleMonCheckRun := true, + bundleMonPrComment := false ) .dependsOn(dom) - .enablePlugins(ScalaJSPlugin, NoPublishPlugin) + .enablePlugins(BundleMonPlugin, NoPublishPlugin) + +ThisBuild / githubWorkflowBuild += + WorkflowStep.Sbt( + List("aftifactSizeTest/bundleMon"), + name = Some("Monitor artifact size"), + cond = Some("matrix.jsenv == 'Chrome'") + ) lazy val jsdocs = project diff --git a/project/plugins.sbt b/project/plugins.sbt index b838f0b8..62313017 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,6 +8,7 @@ libraryDependencies += "org.http4s" %% "http4s-dsl" % http4sVersion libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.12" addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.3") +addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.0-M1") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") From 43c471b4064860c57f9c1132abd150706348a9fd Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 18 Jul 2022 19:46:21 +0000 Subject: [PATCH 08/20] Fix typo :'( --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 243a95af..b92bc280 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,7 +102,7 @@ jobs: - name: Monitor artifact size if: matrix.jsenv == 'Chrome' - run: 'sbt ''++${{ matrix.scala }}'' ''set Global / useJSEnv := JSEnv.${{ matrix.jsenv }}'' aftifactSizeTest/bundleMon' + run: 'sbt ''++${{ matrix.scala }}'' ''set Global / useJSEnv := JSEnv.${{ matrix.jsenv }}'' artifactSizeTest/bundleMon' - name: Check scalafix lints if: matrix.java == 'temurin@8' && !startsWith(matrix.scala, '3.') diff --git a/build.sbt b/build.sbt index f72e1946..f2802ea4 100644 --- a/build.sbt +++ b/build.sbt @@ -211,7 +211,7 @@ lazy val artifactSizeTest = project ThisBuild / githubWorkflowBuild += WorkflowStep.Sbt( - List("aftifactSizeTest/bundleMon"), + List("artifactSizeTest/bundleMon"), name = Some("Monitor artifact size"), cond = Some("matrix.jsenv == 'Chrome'") ) From faa40479eafc608e7770711e477eff2c6f835a14 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 18 Jul 2022 20:35:15 +0000 Subject: [PATCH 09/20] Remove redundant checks --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index f2802ea4..d3444bb1 100644 --- a/build.sbt +++ b/build.sbt @@ -204,6 +204,7 @@ lazy val artifactSizeTest = project "org.http4s" %%% "http4s-circe" % http4sVersion ), bundleMonCheckRun := true, + bundleMonCommitStatus := false, bundleMonPrComment := false ) .dependsOn(dom) From 98ac9e1fda147fafbbb572c7f64027c1448046c7 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Mon, 18 Jul 2022 14:28:13 -0700 Subject: [PATCH 10/20] Bump to 0.1.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c9d6a902..1b9146f5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ libraryDependencies += "org.http4s" %% "http4s-dsl" % http4sVersion libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.12" addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.4") -addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.0-M1") +addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.0") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") From 5527e8c082c99c010ab609ec2a5b6445dcad2e8a Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 19 Jul 2022 16:37:58 +0000 Subject: [PATCH 11/20] Update sbt-bundlemon to 0.1.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1b9146f5..e3aa6d2a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ libraryDependencies += "org.http4s" %% "http4s-dsl" % http4sVersion libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.12" addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.4") -addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.0") +addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.1") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") From edaa129e7b87b372c630d8398ff0ef46c5b1c8e7 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 02:29:18 +0000 Subject: [PATCH 12/20] Update fs2-core to 3.2.11 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d3444bb1..9d8d186b 100644 --- a/build.sbt +++ b/build.sbt @@ -121,7 +121,7 @@ ThisBuild / Test / jsEnv := { } val catsEffectVersion = "3.3.14" -val fs2Version = "3.2.10" +val fs2Version = "3.2.11" val http4sVersion = buildinfo.BuildInfo.http4sVersion // share version with build project val scalaJSDomVersion = "2.2.0" val circeVersion = "0.14.2" From 207398066349fda5731c0e3cd9e26f6ea6326d3a Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 05:13:04 +0000 Subject: [PATCH 13/20] Update http4s-circe, http4s-client, ... to 0.23.14 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e3aa6d2a..ee4d5335 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -val http4sVersion = "0.23.13" +val http4sVersion = "0.23.14" enablePlugins(BuildInfoPlugin) buildInfoKeys += "http4sVersion" -> http4sVersion From 8ec05b33d7fb7effcb2da100b30a1ca386b16fc4 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 20:24:54 +0000 Subject: [PATCH 14/20] Update sbt-mdoc to 2.3.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e3aa6d2a..12ae8ed2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,6 +9,6 @@ libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.12" addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.4") addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.1") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.2") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.3") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") From 001d29df868676cdf9f827b0a62611eee3cb51de Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Sun, 7 Aug 2022 16:30:32 +0000 Subject: [PATCH 15/20] Update sbt-bundlemon to 0.1.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e77f891f..4b1e1042 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ libraryDependencies += "org.http4s" %% "http4s-dsl" % http4sVersion libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.12" addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.4") -addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.1") +addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.2") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.3") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") From 71ca0c6c03810500c58f9087ce65896501444df9 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 9 Aug 2022 12:51:41 +0000 Subject: [PATCH 16/20] Update fs2-core to 3.2.12 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9d8d186b..50fb97b9 100644 --- a/build.sbt +++ b/build.sbt @@ -121,7 +121,7 @@ ThisBuild / Test / jsEnv := { } val catsEffectVersion = "3.3.14" -val fs2Version = "3.2.11" +val fs2Version = "3.2.12" val http4sVersion = buildinfo.BuildInfo.http4sVersion // share version with build project val scalaJSDomVersion = "2.2.0" val circeVersion = "0.14.2" From b0a4a304c7b01c241bab61de65c9733211f55a60 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Thu, 11 Aug 2022 20:25:24 +0000 Subject: [PATCH 17/20] Update scalafmt-core to 3.5.9 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e1c3a6dd..e3c928ea 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.5.8 +version = 3.5.9 runner.dialect = Scala213Source3 From 06c7f1bb133976ed2c2fdb2369dac877ae56f24f Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Fri, 19 Aug 2022 08:29:47 +0000 Subject: [PATCH 18/20] Update sbt-bundlemon to 0.1.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4b1e1042..020d0014 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ libraryDependencies += "org.http4s" %% "http4s-dsl" % http4sVersion libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.12" addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.4") -addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.2") +addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.3") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.3") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") From fd32405d9c7dd882c9c940546fd9c2040722da9f Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:33:36 +0000 Subject: [PATCH 19/20] Update http4s-circe, http4s-client, ... to 0.23.15 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 020d0014..4bcebb88 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -val http4sVersion = "0.23.14" +val http4sVersion = "0.23.15" enablePlugins(BuildInfoPlugin) buildInfoKeys += "http4sVersion" -> http4sVersion From 758244fd33b65b5c175e1c2ea48a652e114fff39 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 24 Aug 2022 13:36:03 +0000 Subject: [PATCH 20/20] Switch back to ember --- build.sbt | 10 ++++++---- project/plugins.sbt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 50fb97b9..9e5a5a6f 100644 --- a/build.sbt +++ b/build.sbt @@ -63,16 +63,18 @@ Global / fileServicePort := { import cats.data.Kleisli import cats.effect.IO import cats.effect.unsafe.implicits.global + import com.comcast.ip4s._ import org.http4s._ import org.http4s.dsl.io._ - import org.http4s.blaze.server.BlazeServerBuilder + import org.http4s.ember.server.EmberServerBuilder import org.http4s.server.staticcontent._ import java.net.InetSocketAddress (for { deferredPort <- IO.deferred[Int] - _ <- BlazeServerBuilder[IO] - .bindSocketAddress(new InetSocketAddress("localhost", 0)) + _ <- EmberServerBuilder + .default[IO] + .withPort(port"0") .withHttpWebSocketApp { wsb => HttpRoutes .of[IO] { @@ -91,7 +93,7 @@ Global / fileServicePort := { } .orNotFound } - .resource + .build .map(_.address.getPort) .evalTap(deferredPort.complete(_)) .useForever diff --git a/project/plugins.sbt b/project/plugins.sbt index 4bcebb88..af3c22a9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ buildInfoKeys += "http4sVersion" -> http4sVersion libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1" libraryDependencies += "org.http4s" %% "http4s-dsl" % http4sVersion -libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.12" +libraryDependencies += "org.http4s" %% "http4s-ember-server" % http4sVersion addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.4") addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.3")