Skip to content

Commit

Permalink
Merge branch 'hotfix/0.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
maesenka committed Apr 2, 2016
2 parents 58169c1 + 01fe5ca commit 0ab8741
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public ClientRequestBuilder addByteArrayBodyPart(String name, byte[] bytes, Stri
* @return this {@code ClientRequestBuilder}
*/
public ClientRequestBuilder addFileBodyPart(String name, File file, String contentType, Charset charset, String fileName, String contentId, String transferEncoding) {
inner.addBodyPart( new FilePart(name, file, contentType, charset, contentId, fileName, transferEncoding) );
inner.addBodyPart( new FilePart(name, file, contentType, charset, fileName, contentId, transferEncoding) );
return this;
}

Expand Down
4 changes: 2 additions & 2 deletions project/BuildSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ trait BuildSettings {

import Dependencies._
val Organization = "be.wegenenverkeer"
val Version = "0.3.0"

val Version = "0.3.1"
val ScalaVersion = "2.11.7"
val ScalaBuildOptions = Seq("-unchecked", "-deprecation", "-feature",
"-language:reflectiveCalls",
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import sbt._

object Dependencies {

val asyncClient = "com.ning" % "async-http-client" % "1.9.36"
val asyncClient = "com.ning" % "async-http-client" % "1.9.31"
val rxjava = "io.reactivex" % "rxjava" % "1.0.16"
val rxscala = "io.reactivex" %% "rxscala" % "0.25.0"
val slf4j = "org.slf4j" % "slf4j-api" % "1.7.6"
Expand Down

0 comments on commit 0ab8741

Please sign in to comment.