Skip to content

Commit

Permalink
Latest versions: Scala, Scalatest, Akka, Akka Http (akka#863)
Browse files Browse the repository at this point in the history
Scala 2.11.12 + 2.12.5
Akka 2.5.11
Akka Http 10.0.13 (including backports to support 10.1.1 see akka#847)
Scalatest 3.0.5
  • Loading branch information
ennru authored Mar 26, 2018
1 parent 61e9ac4 commit e72e221
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ sudo: false

scala:
- "2.11.12"
- "2.12.4"
- "2.12.5"

jdk:
- oraclejdk8
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ object Dependencies {

val AkkaVersion = sys.env.get("AKKA_SERIES") match {
case Some("2.4") => sys.error("Akka 2.4 is not supported anymore")
case _ => "2.5.9"
case _ => "2.5.11"
}

val AwsSdkVersion = "1.11.226"
val AkkaHttpVersion = "10.0.11"
val AkkaHttpVersion = "10.0.13"

val Common = Seq(
// These libraries are added to all modules via the `Common` AutoPlugin
Expand All @@ -18,7 +18,7 @@ object Dependencies {
"com.typesafe.akka" %% "akka-stream-testkit" % AkkaVersion % Test,
"com.typesafe.akka" %% "akka-slf4j" % AkkaVersion % Test,
"ch.qos.logback" % "logback-classic" % "1.2.3" % Test, // Eclipse Public License 1.0
"org.scalatest" %% "scalatest" % "3.0.4" % Test, // ApacheV2
"org.scalatest" %% "scalatest" % "3.0.5" % Test, // ApacheV2
"com.novocode" % "junit-interface" % "0.11" % Test, // BSD-style
"junit" % "junit" % "4.12" % Test // Eclipse Public License 1.0
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import java.util.concurrent.CompletionStage
import scala.compat.java8.FutureConverters._
import akka.{Done, NotUsed}
import akka.actor.ActorSystem
import akka.http.impl.model.JavaUri
import akka.http.javadsl.model.headers.ByteRange
import akka.http.javadsl.model._
import akka.http.scaladsl.model.headers.{ByteRange => ScalaByteRange}
Expand Down Expand Up @@ -144,7 +143,7 @@ final class ObjectMetadata private[javadsl] (

object MultipartUploadResult {
def create(r: CompleteMultipartUploadResult): MultipartUploadResult =
new MultipartUploadResult(JavaUri(r.location), r.bucket, r.key, r.etag)
new MultipartUploadResult(Uri.create(r.location), r.bucket, r.key, r.etag)
}

object S3Client {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ object EventSource {
mat: Materializer): Source[ServerSentEvent, NotUsed] = {
val eventSource =
scaladsl.EventSource(
uri.asInstanceOf[akka.http.impl.model.JavaUri].uri,
uri.asScala,
send(_).toScala.map(_.asInstanceOf[SHttpResponse])(mat.executionContext),
lastEventId.asScala
)(mat)
Expand Down

0 comments on commit e72e221

Please sign in to comment.