From 193043da231f61f524bdbdb024be087637e1f593 Mon Sep 17 00:00:00 2001 From: Anton Parkhomenko Date: Thu, 29 Oct 2020 00:55:12 +0300 Subject: [PATCH] Common: bump specs2-core to 4.10.5 (close #197) --- .../rdbloader/common/StorageTarget.scala | 18 +++++++++--------- project/Dependencies.scala | 4 ++-- project/metals.sbt | 4 ++++ 3 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 project/metals.sbt diff --git a/modules/common/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/common/StorageTarget.scala b/modules/common/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/common/StorageTarget.scala index 8aa9f416b..9148cefd9 100644 --- a/modules/common/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/common/StorageTarget.scala +++ b/modules/common/src/main/scala/com/snowplowanalytics/snowplow/rdbloader/common/StorageTarget.scala @@ -132,12 +132,12 @@ object StorageTarget { object RedshiftJdbc { val empty = RedshiftJdbc(None, None, None, None, None, None, None, None, None, None, None, None) - implicit val jdbcDecoder: Decoder[RedshiftJdbc] = + implicit def jdbcDecoder: Decoder[RedshiftJdbc] = Decoder.forProduct12("BlockingRowsMode", "DisableIsValidQuery", "DSILogLevel", "FilterLevel", "loginTimeout", "loglevel", "socketTimeout", "ssl", "sslMode", "sslRootCert", "tcpKeepAlive", "TCPKeepAliveMinutes")(RedshiftJdbc.apply) - implicit val jdbcEncoder: Encoder.AsObject[RedshiftJdbc] = + implicit def jdbcEncoder: Encoder.AsObject[RedshiftJdbc] = Encoder.forProduct12("BlockingRowsMode", "DisableIsValidQuery", "DSILogLevel", "FilterLevel", "loginTimeout", "loglevel", "socketTimeout", "ssl", "sslMode", "sslRootCert", "tcpKeepAlive", "TCPKeepAliveMinutes")((j: RedshiftJdbc) => @@ -217,25 +217,25 @@ object StorageTarget { .toEitherNel .flatMap { json => (decodeStorageTarget(json).toEitherNel, validate(client)(json).toEitherNel).parMapN { case (config, _) => config } } - implicit val redsfhitConfigDecoder: Decoder[RedshiftConfig] = + implicit def redsfhitConfigDecoder: Decoder[RedshiftConfig] = deriveDecoder[RedshiftConfig] - implicit val encryptedConfigDecoder: Decoder[EncryptedConfig] = + implicit def encryptedConfigDecoder: Decoder[EncryptedConfig] = deriveDecoder[EncryptedConfig] - implicit val tunnerConfigDecoder: Decoder[TunnelConfig] = + implicit def tunnerConfigDecoder: Decoder[TunnelConfig] = deriveDecoder[TunnelConfig] - implicit val bastionConfigDecoder: Decoder[BastionConfig] = + implicit def bastionConfigDecoder: Decoder[BastionConfig] = deriveDecoder[BastionConfig] - implicit val destinationConfigDecoder: Decoder[DestinationConfig] = + implicit def destinationConfigDecoder: Decoder[DestinationConfig] = deriveDecoder[DestinationConfig] - implicit val parameterStoreConfigDecoder: Decoder[ParameterStoreConfig] = + implicit def parameterStoreConfigDecoder: Decoder[ParameterStoreConfig] = deriveDecoder[ParameterStoreConfig] - implicit val passwordConfigDecoder: Decoder[PasswordConfig] = + implicit def passwordConfigDecoder: Decoder[PasswordConfig] = deriveDecoder[PasswordConfig] implicit def schemaCriterionConfigDecoder: Decoder[SchemaCriterion] = diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 34eb86b5c..271582089 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -39,8 +39,8 @@ object Dependencies { val jSch = "0.1.55" // Scala (test only) - val specs2 = "4.0.4" - val scalaCheck = "1.12.6" + val specs2 = "4.10.5" + val scalaCheck = "1.14.0" } val resolutionRepos = Seq( diff --git a/project/metals.sbt b/project/metals.sbt new file mode 100644 index 000000000..23ee198b0 --- /dev/null +++ b/project/metals.sbt @@ -0,0 +1,4 @@ +// DO NOT EDIT! This file is auto-generated. +// This file enables sbt-bloop to create bloop config files. + +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.0-RC1-105-118a551b")