From b9bff7ab7dba02d67df43d497bc1e90048c6bcd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 28 Oct 2021 11:45:32 -0500 Subject: [PATCH 1/3] Update scala versions in build.sbt --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 9a06f5e..b66ed12 100644 --- a/build.sbt +++ b/build.sbt @@ -2,9 +2,9 @@ name := "acked-streams" organization := "com.timcharper" -scalaVersion := "2.13.2" +scalaVersion := "2.13.6" -crossScalaVersions := Seq("2.12.11", "2.13.2") +crossScalaVersions := Seq("2.12.15", "2.13.6") val appProperties = { val prop = new java.util.Properties() From 92258ced1c37b7f941ccf4cafbbb6f2236452afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 28 Oct 2021 11:46:02 -0500 Subject: [PATCH 2/3] Update akka version --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b66ed12..2d3191b 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,7 @@ val appProperties = { } libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-stream" % "2.5.31", + "com.typesafe.akka" %% "akka-stream" % "2.6.17", "org.scalatest" %% "scalatest" % "3.1.1" % "test") version := appProperties.getProperty("version") From 5babfe7f85e3ea5b2074ef0d6fc16d477b86d5b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 28 Oct 2021 11:46:54 -0500 Subject: [PATCH 3/3] Update scalatest version --- build.sbt | 2 +- project/plugins.sbt | 1 + src/test/scala/com/timcharper/acked/AckedSinkSpec.scala | 5 +++-- src/test/scala/com/timcharper/acked/AckedSourceSpec.scala | 5 +++-- src/test/scala/com/timcharper/acked/ComponentsSpec.scala | 5 +++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 2d3191b..a9122f6 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ val appProperties = { libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-stream" % "2.6.17", - "org.scalatest" %% "scalatest" % "3.1.1" % "test") + "org.scalatest" %% "scalatest" % "3.2.10" % "test") version := appProperties.getProperty("version") diff --git a/project/plugins.sbt b/project/plugins.sbt index 6300980..d67bdca 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1,2 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.18-1") diff --git a/src/test/scala/com/timcharper/acked/AckedSinkSpec.scala b/src/test/scala/com/timcharper/acked/AckedSinkSpec.scala index b1132fb..4ef2258 100644 --- a/src/test/scala/com/timcharper/acked/AckedSinkSpec.scala +++ b/src/test/scala/com/timcharper/acked/AckedSinkSpec.scala @@ -2,11 +2,12 @@ package com.timcharper.acked import akka.pattern.ask import akka.stream.ActorMaterializer -import org.scalatest.{FunSpec, Matchers} import scala.concurrent.{Future, Promise} import scala.util.{Failure, Success, Try} +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class AckedSinkSpec extends FunSpec with Matchers with ActorSystemTest { +class AckedSinkSpec extends AnyFunSpec with Matchers with ActorSystemTest { describe("head") { it("acknowledges only the first element") { diff --git a/src/test/scala/com/timcharper/acked/AckedSourceSpec.scala b/src/test/scala/com/timcharper/acked/AckedSourceSpec.scala index fe287f9..f10d259 100644 --- a/src/test/scala/com/timcharper/acked/AckedSourceSpec.scala +++ b/src/test/scala/com/timcharper/acked/AckedSourceSpec.scala @@ -9,14 +9,15 @@ import akka.stream.Materializer import akka.stream.Supervision import akka.stream.scaladsl.Keep import akka.stream.scaladsl.{Sink, Source} -import org.scalatest.{FunSpec, Matchers} import scala.concurrent.{ExecutionContext, Future, Promise} import scala.concurrent.duration._ import scala.util.Random import scala.util.{Failure, Success, Try} +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class AckedSourceSpec extends FunSpec with Matchers with ActorSystemTest { +class AckedSourceSpec extends AnyFunSpec with Matchers with ActorSystemTest { describe("AckedSource operations") { def runLeTest[T, U](input: scala.collection.immutable.Iterable[T] = Range(1, 20))( diff --git a/src/test/scala/com/timcharper/acked/ComponentsSpec.scala b/src/test/scala/com/timcharper/acked/ComponentsSpec.scala index 6206f19..e263cf0 100644 --- a/src/test/scala/com/timcharper/acked/ComponentsSpec.scala +++ b/src/test/scala/com/timcharper/acked/ComponentsSpec.scala @@ -1,6 +1,5 @@ package com.timcharper.acked -import org.scalatest.{FunSpec, Matchers} import akka.stream.Attributes import akka.stream.OverflowStrategy @@ -11,8 +10,10 @@ import scala.concurrent.Promise import scala.collection.mutable._ import scala.util.{Try, Success, Failure} import scala.concurrent.duration._ +import org.scalatest.funspec.AnyFunSpec +import org.scalatest.matchers.should.Matchers -class ComponentsSpec extends FunSpec with Matchers with ActorSystemTest { +class ComponentsSpec extends AnyFunSpec with Matchers with ActorSystemTest { trait Fixtures { implicit val materializer = akka.stream.ActorMaterializer()