Rebase on master; set snapshot version

finagle · Jan 24, 2018 · fa5b437 · fa5b437
1 parent de9c20b
commit fa5b437
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -7,15 +7,15 @@ enablePlugins(TutPlugin)
 
 lazy val buildSettings = Seq(
   organization := "io.github.finagle",
-  version := "0.3.3",
-  scalaVersion := "2.12.2",
-  crossScalaVersions := Seq("2.11.11", "2.12.2")
+  version := "0.4.0-SNAPSHOT",
+  scalaVersion := "2.12.4",
+  crossScalaVersions := Seq("2.11.11", "2.12.4")
 )
 
 val finagleVersion = "17.12.0"
 val shapelessVersion = "2.3.3"
 val catsVersion = "1.0.1"
-val circeVersion = "0.7.1"
+val circeVersion = "0.9.0"
 
 lazy val docSettings = Seq(
   autoAPIMappings := true
@@ -29,7 +29,10 @@ lazy val baseSettings = docSettings ++ Seq(
     "org.scalamock" %% "scalamock-scalatest-support" % "3.6.0" % "test",
     "org.scalatest" %% "scalatest" % "3.0.3" % "test"
   ),
-  resolvers += Resolver.sonatypeRepo("snapshots")
+  resolvers += Resolver.sonatypeRepo("snapshots"),
+  scalacOptions ++= Seq(
+    "-Ypartial-unification"
+  )
 )
 
 lazy val publishSettings = Seq(

diff --git a/featherbed-core/src/main/scala/featherbed/request/HTTPRequest.scala b/featherbed-core/src/main/scala/featherbed/request/HTTPRequest.scala
@@ -133,20 +133,20 @@ object HTTPRequest extends RequestSyntax[HTTPRequest] with RequestTypes[HTTPRequ
       val newContent = req.content match {
         case MimeContent(Form(existing), _) => MimeContent[MultipartForm, MimeContent.MultipartForm](
           MultipartForm(
-            NonEmptyList(first, rest.toList).map((ToFormParam.file.apply _).tupled).sequenceU map {
+            NonEmptyList(first, rest.toList).map((ToFormParam.file.apply _).tupled).sequence map {
               validFiles => validFiles ++ existing.toList
             }
           )
         )
         case MimeContent(MultipartForm(existing), _) => MimeContent[MultipartForm, MimeContent.MultipartForm](
           MultipartForm(
-            NonEmptyList(first, rest.toList).map((ToFormParam.file.apply _).tupled).sequenceU andThen {
+            NonEmptyList(first, rest.toList).map((ToFormParam.file.apply _).tupled).sequence andThen {
               validFiles => existing map (validFiles ++ _.toList)
             }
           )
         )
         case _ => MimeContent[MultipartForm, MimeContent.MultipartForm](MultipartForm(
-          NonEmptyList(first, rest.toList).map((ToFormParam.file.apply _).tupled).sequenceU
+          NonEmptyList(first, rest.toList).map((ToFormParam.file.apply _).tupled).sequence
         ))
       }
       req.copy[Method.Post, Accept, MultipartForm, MimeContent.MultipartForm](