diff --git a/build.sbt b/build.sbt index 4255f00b..ac7c6553 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ name := "tag-manager" version := "1.0" -lazy val scalaVer = "2.12.16" +lazy val scalaVer = "2.12.19" resolvers ++= Resolver.sonatypeOssRepos("releases") @@ -27,20 +27,20 @@ lazy val dependencies = Seq( "com.amazonaws" % "aws-java-sdk-sts" % awsVersion, "com.amazonaws" % "amazon-kinesis-client" % "1.14.10", "com.gu" %% "pan-domain-auth-play_2-8" % "4.0.0", - "com.gu" %% "editorial-permissions-client" % "2.0", + "com.gu" %% "editorial-permissions-client" % "2.15", ws, // for panda "ai.x" %% "play-json-extensions" % "0.42.0", "com.squareup.okhttp3" % "okhttp" % "4.9.2", "com.google.guava" % "guava" % "18.0", - "com.gu" %% "content-api-client-default" % "17.24.1", + "com.gu" %% "content-api-client-default" % "27.0.0", "com.gu" %% "tags-thrift-schema" % "2.8.3", "net.logstash.logback" % "logstash-logback-encoder" % "7.2", "org.slf4j" % "slf4j-api" % "1.7.12", "org.slf4j" % "jcl-over-slf4j" % "1.7.12", "com.gu" %% "panda-hmac-play_2-8" % "4.0.0", - "com.gu" %% "content-api-client-aws" % "0.5", + "com.gu" %% "content-api-client-aws" % "0.7.4", "com.beachape" %% "enumeratum" % "1.5.13", - "org.scalatest" %% "scalatest" % "3.0.5" % "test", + "org.scalatest" %% "scalatest" % "3.2.19" % Test, "com.typesafe.play" %% "play-json-joda" % "2.8.1", "org.apache.commons" % "commons-lang3" % "3.11", "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.13.2", diff --git a/test/model/BatchTagOperationTest.scala b/test/model/BatchTagOperationTest.scala index 9d826c5e..a31abb77 100644 --- a/test/model/BatchTagOperationTest.scala +++ b/test/model/BatchTagOperationTest.scala @@ -1,8 +1,9 @@ package model -import org.scalatest._ +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers -class BatchTagOperationTest extends FlatSpec with Matchers { +class BatchTagOperationTest extends AnyFlatSpec with Matchers { "AddToBottom operation" should "parse correctly" in { BatchTagOperation.AddToBottom.entryName should be ("add-to-bottom") } diff --git a/test/modules/clustersync/SectionEventDeserialiserTest.scala b/test/modules/clustersync/SectionEventDeserialiserTest.scala index 9549bc64..d222c559 100644 --- a/test/modules/clustersync/SectionEventDeserialiserTest.scala +++ b/test/modules/clustersync/SectionEventDeserialiserTest.scala @@ -1,15 +1,15 @@ package modules.clustersync -import java.nio.ByteBuffer - import com.amazonaws.services.kinesis.model.Record import com.gu.tagmanagement.{EventType, SectionEvent} -import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import services.ThriftSerializer +import java.nio.ByteBuffer import scala.util.Success -class SectionEventDeserialiserTest extends FlatSpec with Matchers { +class SectionEventDeserialiserTest extends AnyFlatSpec with Matchers { it should "serialise byte stream from Kinesis record" in { diff --git a/test/modules/clustersync/TagEventDeserialiserTest.scala b/test/modules/clustersync/TagEventDeserialiserTest.scala index 12026ed1..041c009a 100644 --- a/test/modules/clustersync/TagEventDeserialiserTest.scala +++ b/test/modules/clustersync/TagEventDeserialiserTest.scala @@ -1,15 +1,15 @@ package modules.clustersync -import java.nio.ByteBuffer - import com.amazonaws.services.kinesis.model.Record import com.gu.tagmanagement.{EventType, TagEvent} -import org.scalatest.{FlatSpec, FunSuite, Matchers, TryValues} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import services.ThriftSerializer +import java.nio.ByteBuffer import scala.util.Success -class TagEventDeserialiserTest extends FlatSpec with Matchers { +class TagEventDeserialiserTest extends AnyFlatSpec with Matchers { it should "serialise byte stream from Kinesis record" in { diff --git a/test/modules/clustersync/TagSyncUpdateProcessorTest.scala b/test/modules/clustersync/TagSyncUpdateProcessorTest.scala index 81883c1f..a6726ee2 100644 --- a/test/modules/clustersync/TagSyncUpdateProcessorTest.scala +++ b/test/modules/clustersync/TagSyncUpdateProcessorTest.scala @@ -1,16 +1,17 @@ package modules.clustersync -import java.nio.ByteBuffer - import com.amazonaws.services.kinesis.model.Record import com.gu.tagmanagement.{EventType, TagEvent} import model.BlockingLevel -import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import repositories.TagLookupCache import services.ThriftSerializer import utils.TagTestUtils._ -class TagSyncUpdateProcessorTest extends FlatSpec with Matchers { +import java.nio.ByteBuffer + +class TagSyncUpdateProcessorTest extends AnyFlatSpec with Matchers { behavior of "TagSyncUpdateProcessor.process()" diff --git a/test/repositories/TagLookupCacheTest.scala b/test/repositories/TagLookupCacheTest.scala index 7aa1406d..8e3383a1 100644 --- a/test/repositories/TagLookupCacheTest.scala +++ b/test/repositories/TagLookupCacheTest.scala @@ -1,9 +1,11 @@ package repositories -import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers} +import org.scalatest.BeforeAndAfterEach +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers import utils.TagTestUtils._ -class TagLookupCacheTest extends FlatSpec with BeforeAndAfterEach with Matchers { +class TagLookupCacheTest extends AnyFlatSpec with BeforeAndAfterEach with Matchers { private val cache = TagLookupCache