Skip to content

Commit

Permalink
Enable 2.13 for sqs and sns connectors. (#1641)
Browse files Browse the repository at this point in the history
## Purpose

Build sqs and sns connectors with Scala 2.13.0-M5.

## References

Aws Spi Akka Http was released for Scala 2.13.0-M5 recently: matsluni/aws-spi-akka-http#3 (comment)

Fixes #1537 and #1538
  • Loading branch information
2m authored and ennru committed Apr 10, 2019
1 parent 323edc7 commit 7f5a70f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@ lazy val sns = alpakkaProject(
"aws.sns",
Dependencies.Sns,
// For mockito https://github.com/akka/alpakka/issues/390
parallelExecution in Test := false,
crossScalaVersions -= Dependencies.Scala213
parallelExecution in Test := false
)

lazy val solr = alpakkaProject("solr", "solr", Dependencies.Solr, parallelExecution in Test := false)
Expand All @@ -246,8 +245,7 @@ lazy val sqs = alpakkaProject(
"aws.sqs",
Dependencies.Sqs,
// For mockito https://github.com/akka/alpakka/issues/390
parallelExecution in Test := false,
crossScalaVersions -= Dependencies.Scala213
parallelExecution in Test := false
)

lazy val sse = alpakkaProject("sse", "sse", Dependencies.Sse)
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ object Dependencies {

val Sns = Seq(
libraryDependencies ++= Seq(
"com.github.matsluni" %% "aws-spi-akka-http" % "0.0.4" excludeAll ExclusionRule(
"com.github.matsluni" %% "aws-spi-akka-http" % "0.0.5" excludeAll ExclusionRule(
organization = "com.typesafe.akka"
), // ApacheV2
"software.amazon.awssdk" % "sns" % AwsSdk2Version excludeAll (ExclusionRule(
Expand Down Expand Up @@ -373,7 +373,7 @@ object Dependencies {

val Sqs = Seq(
libraryDependencies ++= Seq(
"com.github.matsluni" %% "aws-spi-akka-http" % "0.0.4" excludeAll ExclusionRule(
"com.github.matsluni" %% "aws-spi-akka-http" % "0.0.5" excludeAll ExclusionRule(
organization = "com.typesafe.akka"
), // ApacheV2
"software.amazon.awssdk" % "sqs" % AwsSdk2Version excludeAll (ExclusionRule(
Expand Down
2 changes: 1 addition & 1 deletion sqs/src/test/scala/docs/scaladsl/SqsPublishSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SqsPublishSpec extends FlatSpec with Matchers with DefaultTestContext {
.maxNumberOfMessages(maxNumberOfMessages)
.build()

awsSqsClient.receiveMessage(request).get().messages().asScala
awsSqsClient.receiveMessage(request).get().messages().asScala.toSeq
}
}

Expand Down

0 comments on commit 7f5a70f

Please sign in to comment.