Skip to content

Commit

Permalink
Upgrade what was possible; fix some scalatest deprecations; scalatest…
Browse files Browse the repository at this point in the history
… 3.1.0 requires akka to jump first due to recompile requirement
  • Loading branch information
scullxbones committed Dec 23, 2019
1 parent 388254f commit e82263b
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 20 deletions.
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ val scalaV = scala211V


val LegacyAkkaV = "2.5.12" //min version to have Serialization.withTransportInformation
val LatestAkkaV = "2.5.25"
val LatestAkkaV = "2.5.27"
def akkaV(sv: String): String = sv match {
case "2.11" => LegacyAkkaV
case _ => LatestAkkaV
Expand All @@ -33,12 +33,12 @@ def commonDeps(sv:String) = Seq(
"org.mongodb" % "mongodb-driver-core" % MongoJavaDriverVersion % "compile",
"org.mongodb" % "mongodb-driver" % MongoJavaDriverVersion % "test",
"org.slf4j" % "slf4j-api" % "1.7.30" % "test",
"org.apache.logging.log4j" % "log4j-api" % "2.13.0" % "test",
"org.apache.logging.log4j" % "log4j-core" % "2.13.0" % "test",
"org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.13.0" % "test",
"org.apache.logging.log4j" % "log4j-api" % "2.13.0" % "test",
"org.apache.logging.log4j" % "log4j-core" % "2.13.0" % "test",
"org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.13.0" % "test",
"org.scalatest" %% "scalatest" % "3.0.8" % "test",
"junit" % "junit" % "4.12" % "test",
"org.mockito" % "mockito-all" % "1.10.19" % "test",
"org.mockito" % "mockito-all" % "1.10.19" % "test",
"com.typesafe.akka" %% "akka-slf4j" % akkaV(sv) % "test",
"com.typesafe.akka" %% "akka-testkit" % akkaV(sv) % "test",
"com.typesafe.akka" %% "akka-persistence-tck" % akkaV(sv) % "test",
Expand Down Expand Up @@ -118,8 +118,8 @@ lazy val `akka-persistence-mongo-scala` = (project in file("scala"))
.settings(commonSettings:_*)
.settings(
libraryDependencies ++= Seq(
"org.mongodb.scala" %% "mongo-scala-driver" % "2.7.0" % "compile",
"org.mongodb.scala" %% "mongo-scala-bson" % "2.7.0" % "compile",
"org.mongodb.scala" %% "mongo-scala-driver" % "2.8.0" % "compile",
"org.mongodb.scala" %% "mongo-scala-bson" % "2.8.0" % "compile",
"io.netty" % "netty-buffer" % "4.1.44.Final" % "compile",
"io.netty" % "netty-transport" % "4.1.44.Final" % "compile",
"io.netty" % "netty-handler" % "4.1.44.Final" % "compile",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import akka.actor.ActorSystem
import akka.contrib.persistence.mongodb.ConfigLoanFixture._
import com.typesafe.config.{Config, ConfigFactory}
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

import scala.concurrent.Await
import scala.concurrent.duration._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package akka.contrib.persistence.mongodb

import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

@RunWith(classOf[JUnitRunner])
class CasbahPersistenceJournalTckSpec extends JournalTckSpec(classOf[CasbahPersistenceExtension], s"casbahJournalTck")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import akka.testkit._
import com.mongodb.casbah.Imports._
import com.typesafe.config.{ConfigFactory, ConfigValueFactory}
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

import scala.collection.mutable
import scala.concurrent.Await
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import akka.serialization.SerializationExtension
import akka.testkit.TestKit
import com.mongodb.casbah.Imports._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

@RunWith(classOf[JUnitRunner])
class CasbahPersistenceSnapshotterSpec extends TestKit(ActorSystem("unit-test")) with CasbahPersistenceSpec {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package akka.contrib.persistence.mongodb

import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

@RunWith(classOf[JUnitRunner])
class CasbahPersistenceSnapshotterTckSpec extends SnapshotTckSpec(classOf[CasbahPersistenceExtension], "casbah-snaptck")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.typesafe.config.{Config, ConfigFactory}
import org.junit.runner.RunWith
import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.{PatienceConfiguration, ScalaFutures}
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner
import scala.concurrent.duration._

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import akka.contrib.persistence.mongodb.ConfigLoanFixture._
import com.typesafe.config.{Config, ConfigFactory}
import org.junit.runner.RunWith
import org.scalatest.BeforeAndAfterAll
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

import scala.concurrent._
import scala.concurrent.duration._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package akka.contrib.persistence.mongodb

import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

@RunWith(classOf[JUnitRunner])
class RxMongoPersistenceJournalTckSpec extends JournalTckSpec(classOf[RxMongoPersistenceExtension], "rxMongoJournalTck", RxMongoConfigTest.rxMongoConfig)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package akka.contrib.persistence.mongodb

import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

@RunWith(classOf[JUnitRunner])
class RxMongoPersistenceSnapshotTckSpec extends SnapshotTckSpec(classOf[RxMongoPersistenceExtension], "rxMongoSnapshotTck", RxMongoConfigTest.rxMongoConfig)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import org.junit.runner.RunWith
import org.mongodb.scala.bson.{BsonArray, BsonDocument, BsonInt32, BsonString, BsonValue}
import org.scalatest.BeforeAndAfterAll
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

import scala.concurrent.duration._
import scala.collection.JavaConverters._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package akka.contrib.persistence.mongodb

import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

@RunWith(classOf[JUnitRunner])
class ScalaDriverPersistenceSnapshotTckSpec extends SnapshotTckSpec(classOf[ScalaDriverPersistenceExtension], "officialScalaSnapshotTck")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import akka.contrib.persistence.mongodb.ConfigLoanFixture.withConfig
import com.typesafe.config.{Config, ConfigFactory}
import org.junit.runner.RunWith
import org.scalatest.BeforeAndAfterAll
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

import scala.concurrent.{Await, Future, duration}
import duration._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package akka.contrib.persistence.mongodb

import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatestplus.junit.JUnitRunner

@RunWith(classOf[JUnitRunner])
class ScalaPersistenceJournalTckSpec extends JournalTckSpec(classOf[ScalaDriverPersistenceExtension], s"officialScalaJournalTck")
Expand Down

0 comments on commit e82263b

Please sign in to comment.