Skip to content

Commit

Permalink
Merge pull request #399 from http4s/merge-0.23-to-0.23-scala3
Browse files Browse the repository at this point in the history
Merge 0.23 to 0.23-scala3
  • Loading branch information
froth authored Jul 25, 2024
2 parents 75786aa + 3abffb1 commit 6da2dca
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq(
ThisBuild / githubWorkflowPublishTargetBranches := Seq.empty

val Http4sVersion = "0.23.27"
val CirceVersion = "0.14.7"
val CirceVersion = "0.14.9"
val MunitVersion = "1.0.0"
val LogbackVersion = "1.5.6"
val MunitCatsEffectVersion = "2.0.0"
Expand All @@ -43,7 +43,7 @@ lazy val root = project
"org.http4s" %% "http4s-dsl" % Http4sVersion,
"io.circe" %% "circe-generic" % CirceVersion,
"org.scalameta" %% "munit" % MunitVersion % Test,
"org.typelevel" %% "munit-cats-effect" % MunitCatsEffectVersion % Test,
"org.typelevel" %% "munit-cats-effect" % MunitCatsEffectVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Runtime,
),
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1"),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion project/plugin.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.2")
addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.2")
6 changes: 3 additions & 3 deletions src/main/g8/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
val Http4sVersion = "0.23.27"
val CirceVersion = "0.14.7"
val CirceVersion = "0.14.9"
val MunitVersion = "1.0.0"
val LogbackVersion = "1.5.6"
val MunitCatsEffectVersion = "2.0.0"
Expand All @@ -16,8 +16,8 @@ lazy val root = (project in file("."))
"org.http4s" %% "http4s-circe" % Http4sVersion,
"org.http4s" %% "http4s-dsl" % Http4sVersion,
"org.scalameta" %% "munit" % MunitVersion % Test,
"org.typelevel" %% "munit-cats-effect" % MunitCatsEffectVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion,
"org.typelevel" %% "munit-cats-effect" % MunitCatsEffectVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Runtime,
),
assembly / assemblyMergeStrategy := {
case "module-info.class" => MergeStrategy.discard
Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1

0 comments on commit 6da2dca

Please sign in to comment.