Skip to content

Akka 2.6 #10

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.

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -13,8 +13,8 @@ val appProperties = {
}

libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-stream" % "2.5.31",
"org.scalatest" %% "scalatest" % "3.1.1" % "test")
"com.typesafe.akka" %% "akka-stream" % "2.6.17",
"org.scalatest" %% "scalatest" % "3.2.10" % "test")

version := appProperties.getProperty("version")

Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.18-1")
5 changes: 3 additions & 2 deletions src/test/scala/com/timcharper/acked/AckedSinkSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
5 changes: 3 additions & 2 deletions src/test/scala/com/timcharper/acked/AckedSourceSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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))(
Expand Down
5 changes: 3 additions & 2 deletions src/test/scala/com/timcharper/acked/ComponentsSpec.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.timcharper.acked

import org.scalatest.{FunSpec, Matchers}

import akka.stream.Attributes
import akka.stream.OverflowStrategy
Expand All @@ -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()

Expand Down