Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Amazon SDK 1.10.2 #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −9
Open

Add support for Amazon SDK 1.10.2 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object Build extends Build {

val buildSettings = Seq(
organization := "com.sclasen",
version := "0.3.7-SNAPSHOT",
version := "0.4.0",
scalaVersion := "2.11.2",
crossScalaVersions := Seq("2.10.4", "2.11.2"),
scalacOptions ++= Seq("-feature", "-deprecation", "-language:implicitConversions", "-language:postfixOps"),
Expand Down Expand Up @@ -107,9 +107,9 @@ object Build extends Build {

def deps = Seq(aws, akka, scalaTest, akka_testkit, spray)

val spray = "io.spray" %% "spray-client" % "1.3.2" % "compile"
val aws = "com.amazonaws" % "aws-java-sdk" % "1.8.9.1" % "compile"
val akka = "com.typesafe.akka" %% "akka-actor" % "2.3.5" % "compile"
val spray = "io.spray" %% "spray-client" % "1.3.3" % "compile"
val aws = "com.amazonaws" % "aws-java-sdk" % "1.10.2" % "compile"
val akka = "com.typesafe.akka" %% "akka-actor" % "2.3.11" % "compile"
val akka_testkit = "com.typesafe.akka" %% "akka-testkit" % "2.3.5" % "test"
val scalaTest = "org.scalatest" %% "scalatest" % "2.2.1" % "test"
}
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.5
sbt.version=0.13.8
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"

addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")

resolvers += "sbt-idea-repo" at "http://mpeltonen.github.com/maven/"

Expand Down
2 changes: 1 addition & 1 deletion spray-aws/src/main/scala/com/sclasen/spray/aws/SprayAWSClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ abstract class SprayAWSClient(props: SprayAWSClientProps) {

def encodeQuery[T](awsReq: Request[T]) =
awsReq.getParameters.asScala.toList.map({
case (k, v) => s"${awsURLEncode(k)}=${awsURLEncode(v)}"
case (k, vList) => vList.asScala.toList.map(v => s"${awsURLEncode(k)}=${awsURLEncode(v)}")
}).mkString("&")

def formData[T](awsReq: Request[T]) =
Expand Down
2 changes: 1 addition & 1 deletion spray-s3/src/main/scala/com/sclasen/spray/aws/s3/S3Client.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ object MarshallersAndUnmarshallers {
class S3Marshaller[X <: AmazonWebServiceRequest](httpMethod: HttpMethodName)
extends Marshaller[Request[X], X] {
def marshall(originalRequest: X): Request[X] = {
val request = new DefaultRequest[X](originalRequest, Constants.S3_SERVICE_NAME)
val request = new DefaultRequest[X](originalRequest, Constants.S3_SERVICE_DISPLAY_NAME)
request.setHttpMethod(httpMethod)
request.addHeader("x-amz-content-sha256", "required")

Expand Down