Browse Source

Update http4s and dependencies (#6558)

Co-authored-by: Rafał Sumisławski <[email protected]>
Rafał Sumisławski 4 years ago
parent
commit
fce194151e

+ 9 - 9
frameworks/Scala/http4s/build.sbt

@@ -2,7 +2,7 @@ name := "http4s"
 
 version := "1.0"
 
-scalaVersion := "2.13.3"
+scalaVersion := "2.13.5"
 
 scalacOptions ++= Seq(
   "-deprecation",
@@ -18,11 +18,11 @@ scalacOptions ++= Seq(
 
 enablePlugins(SbtTwirl)
 
-val http4sVersion = "0.21.7"
+val http4sVersion = "0.21.22"
 
-assemblyMergeStrategy in assembly := {
+assembly / assemblyMergeStrategy := {
   case PathList(xs @ _*) if xs.last == "io.netty.versions.properties" => MergeStrategy.rename
-  case other => (assemblyMergeStrategy in assembly).value(other)
+  case other => (assembly / assemblyMergeStrategy).value(other)
 }
 
 libraryDependencies ++= Seq(
@@ -32,11 +32,11 @@ libraryDependencies ++= Seq(
   "org.http4s" %% "http4s-circe" % http4sVersion,
   // Optional for auto-derivation of JSON codecs
   "io.circe" %% "circe-generic" % "0.13.0",
-  "org.typelevel" %% "cats-effect" % "2.2.0",
-  "co.fs2" %% "fs2-core" % "2.4.4",
-  "co.fs2" %% "fs2-io" % "2.4.4",
-  "io.getquill" %% "quill-jasync-postgres" % "3.5.2",
-  "io.getquill" %% "quill-jasync" % "3.5.2",
+  "org.typelevel" %% "cats-effect" % "2.5.0",
+  "co.fs2" %% "fs2-core" % "2.5.5",
+  "co.fs2" %% "fs2-io" % "2.5.5",
+  "io.getquill" %% "quill-jasync-postgres" % "3.7.0",
+  "io.getquill" %% "quill-jasync" % "3.7.0",
   "ch.qos.logback" % "logback-classic" % "1.2.3"
 )
 

+ 1 - 1
frameworks/Scala/http4s/project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.5.1

+ 1 - 1
frameworks/Scala/http4s/project/plugins.sbt

@@ -1,2 +1,2 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")

+ 1 - 0
frameworks/Scala/http4s/sbt

@@ -133,6 +133,7 @@ make_url () {
       0.10.* ) echo "$base/org.scala-tools.sbt/sbt-launch/$version/sbt-launch.jar" ;;
     0.11.[12]) echo "$base/org.scala-tools.sbt/sbt-launch/$version/sbt-launch.jar" ;;
           0.*) echo "$base/org.scala-sbt/sbt-launch/$version/sbt-launch.jar" ;;
+        1.5.*) echo "$base/org/scala-sbt/sbt-launch/$version/sbt-launch-$version.jar" ;;
             *) echo "$base/org/scala-sbt/sbt-launch/$version/sbt-launch.jar" ;;
   esac
 }