Merge pull request #56 from http4s/topic/merge-0.2-main

Merge series/0.2 into main

Author: armanbilge

.github/workflows/ci.yml

@@ -27,18 +27,20 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.12.15, 3.1.0, 2.13.7]
-        java: [adopt@1.8]
+        java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         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: Cache sbt
         uses: actions/cache@v2
@@ -74,18 +76,20 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.7]
-        java: [adopt@1.8]
+        java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         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: Cache sbt
         uses: actions/cache@v2

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.1.0
+version = 3.2.1
 
 runner.dialect = Scala213Source3
 

build.sbt

@@ -41,6 +41,8 @@ ThisBuild / scmInfo := Some(
 
 ThisBuild / crossScalaVersions := Seq("2.12.15", "3.1.0", "2.13.7")
 
+ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"))
+
 replaceCommandAlias("ci", CI.AllCIs.map(_.toString).mkString)
 addCommandAlias("ciFirefox", CI.Firefox.toString)
 addCommandAlias("ciChrome", CI.Chrome.toString)
@@ -105,12 +107,13 @@ ThisBuild / Test / jsEnv := {
   }
 }
 
-val catsEffectVersion = "3.2.9"
-val fs2Version = "3.2.2"
+val catsEffectVersion = "3.3.0"
+val fs2Version = "3.2.3"
 val http4sVersion = "1.0.0-M29"
 val scalaJSDomVersion = "2.0.0"
+val circeVersion = "0.15.0-M1"
 val munitVersion = "0.7.29"
-val munitCEVersion = "1.0.6"
+val munitCEVersion = "1.0.7"
 
 lazy val root =
   project.in(file(".")).aggregate(dom, tests).enablePlugins(NoPublishPlugin)
@@ -162,7 +165,15 @@ import laika.ast.Path.Root
 import laika.ast._
 import laika.ast.LengthUnit._
 import laika.helium.Helium
-import laika.helium.config.{HeliumIcon, IconLink, ImageLink, ReleaseInfo, Teaser, TextLink}
+import laika.helium.config.{
+  Favicon,
+  HeliumIcon,
+  IconLink,
+  ImageLink,
+  ReleaseInfo,
+  Teaser,
+  TextLink
+}
 import laika.theme.config.Color
 
 Global / excludeLintKeys += laikaDescribe
@@ -171,8 +182,13 @@ lazy val docs =
   project
     .in(file("mdocs"))
     .settings(
-      fatalWarningsInCI := false, // Remove once mdocjs bumps to sjs-dom v2
+      fatalWarningsInCI := false,
       mdocJS := Some(jsdocs),
+      mdocVariables ++= Map(
+        "js-opt" -> "fast",
+        "HTTP4S_VERSION" -> http4sVersion,
+        "CIRCE_VERSION" -> circeVersion
+      ),
       Laika / sourceDirectories := Seq(mdocOut.value),
       laikaDescribe := "<disabled>",
       laikaConfig ~= { _.withRawContent },
@@ -210,6 +226,13 @@ lazy val docs =
             (Color.hex("334044"), Color.hex("5B7980")) // only used for landing page background
         )
         .site
+        .favIcons(
+          Favicon
+            .external("https://http4s.org/images/http4s-favicon.svg", "32x32", "image/svg+xml")
+            .copy(sizes = None),
+          Favicon.external("https://http4s.org/images/http4s-favicon.png", "32x32", "image/png")
+        )
+        .site
         .darkMode
         .disabled
         .site

docs/README.md

@@ -21,11 +21,11 @@ libraryDependencies += "org.http4s" %%% "http4s-dom" % "0.2.0"
 // libraryDependencies += "org.http4s" %%% "http4s-dom" % "0.1.0"
 
 // recommended, brings in the latest client module
-libraryDependencies += "org.http4s" %%% "http4s-client" % "0.23.6"
+libraryDependencies += "org.http4s" %%% "http4s-client" % "@HTTP4S_VERSION@"
 
 // optional, for JSON support
-libraryDependencies += "org.http4s" %%% "http4s-circe" % "0.23.6"
-libraryDependencies += "io.circe" %%% "circe-generic" % "0.15.0-M1"
+libraryDependencies += "org.http4s" %%% "http4s-circe" % "@HTTP4S_VERSION@"
+libraryDependencies += "io.circe" %%% "circe-generic" % "@CIRCE_VERSION@"
 ```
 
 ## Example

docs/default.template.html

@@ -13,7 +13,7 @@
       <meta name="description" content="${_}"/>
     @:@
     @:for(helium.favIcons)
-      <link rel="icon" @:attribute(sizes, _.sizes) @:attribute(type, _.type) href="@:path(_.target)"/>
+      <link rel="icon" @:attribute(sizes, _.sizes) @:attribute(type, _.type) @:attribute(href, _.target)/>
     @:@
     @:for(helium.webFonts)
       <link rel="stylesheet" href="${_}">

project/plugins.sbt

@@ -1,8 +1,13 @@
+val http4sVersion = "0.23.7"
+
+enablePlugins(BuildInfoPlugin)
+buildInfoKeys += "http4sVersion" -> http4sVersion
+
 libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
-libraryDependencies += "org.http4s" %% "http4s-ember-server" % "0.23.6"
+libraryDependencies += "org.http4s" %% "http4s-ember-server" % http4sVersion
 
-addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.22.1")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
+addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.23.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.5")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24")

project/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")