Skip to content
This repository was archived by the owner on Oct 10, 2023. It is now read-only.

Update akka-stream, akka-testkit to 2.6.4 #16

Merged
merged 5 commits into from
Apr 23, 2020
Merged

Update akka-stream, akka-testkit to 2.6.4 #16

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc353a5
Update akka-stream, akka-testkit to 2.6.4
scala-steward Mar 23, 2020
7a2e23f
Merge branch 'master' into update/akka-stream-2.6.4
scala-steward Apr 6, 2020
4ee8dbf
Update akka-stream, akka-testkit to 2.6.4
scala-steward Apr 6, 2020
16ce787
Remove ActorMaterializer
saeltz Apr 23, 2020
fe2fa10
Merge branch 'master' into update/akka-stream-2.6.4
saeltz Apr 23, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into update/akka-stream-2.6.4
  • Loading branch information
@saeltz
saeltz authored Apr 23, 2020
commit fe2fa10e8efb8af6fee744d6349892c5e7712b3b
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ lazy val awsDependencies = Seq(

lazy val testDependencies = Seq(
"org.scalatest" %% "scalatest" % "3.1.1" % Test,
"org.mockito" %% "mockito-scala" % "1.13.5" % Test,
"org.mockito" %% "mockito-scala" % "1.13.9" % Test,
"org.mock-server" % "mockserver-netty" % "5.10.0" % Test
)

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.