Skip to content

Commit 6664939

Browse files
authored
Merge branch 'main' into update/http4s-server-0.23.18
2 parents 03af6a0 + cba25b6 commit 6664939

4 files changed

Lines changed: 13 additions & 8 deletions

File tree

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
name := "feral"
1818

19-
ThisBuild / tlBaseVersion := "0.1"
19+
ThisBuild / tlBaseVersion := "0.2"
2020
ThisBuild / startYear := Some(2021)
2121

2222
ThisBuild / developers := List(
@@ -60,7 +60,7 @@ val catsEffectVersion = "3.4.5"
6060
val circeVersion = "0.14.3"
6161
val fs2Version = "3.5.0"
6262
val http4sVersion = "0.23.18"
63-
val natchezVersion = "0.1.6"
63+
val natchezVersion = "0.3.0"
6464
val munitVersion = "0.7.29"
6565
val munitCEVersion = "1.0.7"
6666
val scalacheckEffectVersion = "1.0.4"
@@ -109,7 +109,7 @@ lazy val lambda = crossProject(JSPlatform, JVMPlatform)
109109
.jsSettings(
110110
libraryDependencies ++= Seq(
111111
"io.circe" %%% "circe-scalajs" % circeVersion,
112-
"io.github.cquiroz" %%% "scala-java-time" % "2.4.0"
112+
"io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
113113
)
114114
)
115115
.jvmSettings(
@@ -182,8 +182,8 @@ lazy val examples = crossProject(JSPlatform, JVMPlatform)
182182
"org.http4s" %%% "http4s-dsl" % http4sVersion,
183183
"org.http4s" %%% "http4s-ember-client" % http4sVersion,
184184
"org.tpolecat" %%% "natchez-xray" % natchezVersion,
185-
"org.tpolecat" %%% "natchez-http4s" % "0.3.2",
186-
"org.tpolecat" %%% "skunk-core" % "0.3.2"
185+
"org.tpolecat" %%% "natchez-http4s" % "0.5.0",
186+
"org.tpolecat" %%% "skunk-core" % "0.5.0"
187187
)
188188
)
189189
.settings(commonSettings)

lambda/shared/src/main/scala/feral/lambda/events/ApiGatewayProxyEventV2.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package events
1919

2020
import io.circe.Decoder
2121
import natchez.Kernel
22+
import org.typelevel.ci.CIString
2223

2324
final case class Http(method: String)
2425
object Http {
@@ -52,5 +53,6 @@ object ApiGatewayProxyEventV2 {
5253
"isBase64Encoded"
5354
)(ApiGatewayProxyEventV2.apply)
5455

55-
implicit def kernelSource: KernelSource[ApiGatewayProxyEventV2] = e => Kernel(e.headers)
56+
implicit def kernelSource: KernelSource[ApiGatewayProxyEventV2] =
57+
e => Kernel(e.headers.map { case (name, value) => CIString(name) -> value })
5658
}

lambda/shared/src/main/scala/feral/lambda/events/SqsEvent.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package events
2020
import io.circe.Decoder
2121
import io.circe.scodec._
2222
import natchez.Kernel
23+
import org.typelevel.ci._
2324
import scodec.bits.ByteVector
2425

2526
import java.time.Instant
@@ -109,7 +110,9 @@ object SqsRecordAttributes {
109110
))
110111

111112
implicit def kernelSource: KernelSource[SqsRecordAttributes] = a =>
112-
Kernel(a.awsTraceHeader.map("X-Amzn-Trace-Id" -> _).toMap)
113+
Kernel(a.awsTraceHeader.map(`X-Amzn-Trace-Id` -> _).toMap)
114+
115+
private[this] val `X-Amzn-Trace-Id` = ci"X-Amzn-Trace-Id"
113116
}
114117

115118
sealed abstract class SqsMessageAttribute

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.18")
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
33
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")

0 commit comments

Comments
 (0)