2
0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-22 02:02:14 +00:00

Updating some dependencies (#227)

* Updated scalike to 3.3.1
* Updated play from 2.6.15 -> 2.6.19
* Updated akka-http from 10.1.3 -> 10.1.5
* Updated play-json from 2.1.9 -> 2.6.10
* Removed akka-remote dependency

Other changes:
* Renamed AkkaTestJawn -> ResultHelpers
* Removed the AkkaTestJawn (no longer used)
This commit is contained in:
Paul Cleary 2018-09-20 16:32:44 -04:00 committed by Rebecca Star
parent ce85bd1d57
commit c34b07f612
4 changed files with 9 additions and 31 deletions

View File

@ -16,7 +16,6 @@
package vinyldns.api
import akka.util.Timeout
import cats.effect._
import cats.implicits._
import vinyldns.api.domain.batch.BatchChangeInterfaces.ValidatedBatch
@ -30,8 +29,6 @@ import scala.concurrent.ExecutionContext.Implicits.global
trait CatsHelpers {
implicit val baseTimeout: Timeout = new Timeout(2.seconds)
def await[E, T](f: => IO[T], duration: FiniteDuration = 1.second): T = {
val i: IO[Either[E, T]] = f.attempt.map {
case Right(ok) => Right(ok.asInstanceOf[T])

View File

@ -16,16 +16,12 @@
package vinyldns.api
import akka.actor._
import akka.testkit.TestEvent.Mute
import akka.testkit.{EventFilter, TestKit}
import akka.util.Timeout
import cats.data.Validated.{Invalid, Valid}
import cats.data.ValidatedNel
import cats.effect._
import cats.implicits._
import cats.scalatest.ValidatedMatchers
import org.scalatest.{BeforeAndAfterAll, Matchers, PropSpec, Suite}
import org.scalatest.{Matchers, PropSpec}
import scala.concurrent.duration._
import scala.concurrent.ExecutionContext.Implicits.global
@ -35,8 +31,6 @@ final case class TimeoutException(message: String) extends Throwable(message)
trait ResultHelpers {
implicit val baseTimeout: Timeout = new Timeout(2.seconds)
def await[T](f: => IO[_], duration: FiniteDuration = 1.second): T =
awaitResultOf[T](f.map(_.asInstanceOf[T]).attempt, duration).toOption.get
@ -86,14 +80,3 @@ object ValidationTestImprovements extends PropSpec with Matchers with ValidatedM
value.failures.map(_ shouldBe an[EE])
}
}
class AkkaTestJawn
extends TestKit(ActorSystem("vinyldns", VinylDNSConfig.config))
with Suite
with BeforeAndAfterAll
with ResultHelpers {
system.eventStream.publish(Mute(EventFilter.info(), EventFilter.debug(), EventFilter.warning()))
override def afterAll(): Unit = system.terminate()
}

View File

@ -20,20 +20,19 @@ import cats.scalatest.EitherMatchers
import org.joda.time.DateTime
import org.mockito.Mockito._
import org.scalatest.mockito.MockitoSugar
import org.scalatest.{BeforeAndAfterEach, Matchers, WordSpecLike}
import org.scalatest.{BeforeAndAfterEach, Matchers, WordSpec}
import vinyldns.api.Interfaces._
import vinyldns.api.domain.dns.DnsConnection
import vinyldns.api.domain.dns.DnsProtocol.TypeNotFound
import vinyldns.core.domain.record._
import vinyldns.api.{AkkaTestJawn, ResultHelpers, VinylDNSTestData}
import vinyldns.api.{ResultHelpers, VinylDNSTestData}
import cats.effect._
import vinyldns.core.domain.zone.{Zone, ZoneConnection}
import scala.concurrent.duration._
class ZoneConnectionValidatorSpec
extends AkkaTestJawn
with WordSpecLike
extends WordSpec
with Matchers
with MockitoSugar
with VinylDNSTestData

View File

@ -1,7 +1,7 @@
import sbt._
object Dependencies {
lazy val akkaHttpV = "10.1.3"
lazy val akkaHttpV = "10.1.5"
lazy val akkaV = "2.5.12"
lazy val jettyV = "8.1.12.v20130726"
lazy val pureConfigV = "0.9.2"
@ -11,14 +11,13 @@ object Dependencies {
lazy val configV = "1.3.2"
lazy val scalaTestV = "3.0.4"
lazy val scodecV = "1.1.5"
lazy val playV = "2.6.15"
lazy val playV = "2.6.19"
lazy val awsV = "1.11.95"
lazy val compileDependencies = Seq(
"com.typesafe.akka" %% "akka-http" % akkaHttpV,
"com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpV,
"de.heikoseeberger" %% "akka-http-json4s" % "1.21.0",
"com.typesafe.akka" %% "akka-remote" % akkaV,
"com.typesafe.akka" %% "akka-slf4j" % akkaV,
"com.typesafe.akka" %% "akka-actor" % akkaV,
"ch.qos.logback" % "logback-classic" % "1.0.7",
@ -36,8 +35,8 @@ object Dependencies {
"org.flywaydb" % "flyway-core" % "5.1.4",
"org.json4s" %% "json4s-ext" % "3.5.3",
"org.json4s" %% "json4s-jackson" % "3.5.3",
"org.scalikejdbc" %% "scalikejdbc" % "2.5.2",
"org.scalikejdbc" %% "scalikejdbc-config" % "2.5.2",
"org.scalikejdbc" %% "scalikejdbc" % "3.3.1",
"org.scalikejdbc" %% "scalikejdbc-config" % "3.3.1",
"org.scodec" %% "scodec-bits" % scodecV,
"org.slf4j" % "slf4j-api" % "1.7.7",
"co.fs2" %% "fs2-core" % "0.10.5",
@ -80,7 +79,7 @@ object Dependencies {
)
lazy val portalDependencies = Seq(
"com.typesafe.play" %% "play-json" % "2.6.9",
"com.typesafe.play" %% "play-json" % "2.6.10",
"com.amazonaws" % "aws-java-sdk-core" % awsV withSources(),
"com.amazonaws" % "aws-java-sdk-dynamodb" % awsV withSources(),
"com.typesafe.play" %% "play-jdbc" % playV,