From e9b1e2d905a0354b70df2b2f489464394b750aa0 Mon Sep 17 00:00:00 2001 From: Dmitry Kurinskiy Date: Thu, 18 Apr 2019 18:39:48 +0300 Subject: [PATCH] Updated dependencies (#5) --- build.sbt | 8 ++++---- jwt/src/main/scala/fluence/crypto/jwt/CryptoJwt.scala | 2 +- .../main/scala/fluence/crypto/keystore/KeyStore.scala | 2 +- project/plugins.sbt | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.sbt b/build.sbt index c608635..4b84522 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ val scalaV = scalaVersion := "2.12.8" val commons = Seq( scalaV, - version := "0.0.3", + version := "0.0.4", fork in Test := true, parallelExecution in Test := false, organization := "one.fluence", @@ -31,7 +31,7 @@ val commons = Seq( commons -val CodecV = "0.0.4" +val CodecV = "0.0.5" val CatsEffectV = "1.2.0" @@ -39,7 +39,7 @@ val SloggingV = "0.6.1" val ScalatestV = "3.0.+" -val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15on" % "1.60" +val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15on" % "1.61" enablePlugins(AutomateHeaderPlugin) @@ -93,7 +93,6 @@ lazy val `crypto-hashsign` = crossProject(JVMPlatform, JSPlatform) .settings( commons, libraryDependencies ++= Seq( - "biz.enef" %%% "slogging" % SloggingV, "org.scalatest" %%% "scalatest" % ScalatestV % Test ) ) @@ -126,6 +125,7 @@ lazy val `crypto-cipher` = crossProject(JVMPlatform, JSPlatform) .settings( commons, libraryDependencies ++= Seq( + "biz.enef" %%% "slogging" % SloggingV, "org.scalatest" %%% "scalatest" % ScalatestV % Test ) ) diff --git a/jwt/src/main/scala/fluence/crypto/jwt/CryptoJwt.scala b/jwt/src/main/scala/fluence/crypto/jwt/CryptoJwt.scala index ee7c593..4501db3 100644 --- a/jwt/src/main/scala/fluence/crypto/jwt/CryptoJwt.scala +++ b/jwt/src/main/scala/fluence/crypto/jwt/CryptoJwt.scala @@ -88,7 +88,7 @@ object CryptoJwt { private val alphabet = Bases.Alphabets.Base64Url - private val strVec = BitsCodecs.base64AlphabetToVector(alphabet).swap + private val strVec = BitsCodecs.Base64.alphabetToVector(alphabet).swap val signatureCodec: PureCodec[Signature, String] = PureCodec.liftB[Signature, ByteVector](_.sign, Signature(_)) andThen strVec diff --git a/keystore/src/main/scala/fluence/crypto/keystore/KeyStore.scala b/keystore/src/main/scala/fluence/crypto/keystore/KeyStore.scala index fc28c1c..a04cc95 100644 --- a/keystore/src/main/scala/fluence/crypto/keystore/KeyStore.scala +++ b/keystore/src/main/scala/fluence/crypto/keystore/KeyStore.scala @@ -69,7 +69,7 @@ object KeyStore { ) // ByteVector to/from String, with the chosen alphabet - private val vecToStr = BitsCodecs.base64AlphabetToVector(alphabet).swap + private val vecToStr = BitsCodecs.Base64.alphabetToVector(alphabet).swap implicit val keyPairJsonCodec: PureCodec[KeyPair, Json] = PureCodec.liftB[KeyPair, (ByteVector, ByteVector)]( diff --git a/project/plugins.sbt b/project/plugins.sbt index 749ff02..54f9b7b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,14 +1,14 @@ -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0") -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.15") +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.20") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.0.0") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.2.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.27") addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.6.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.13.1") +addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.14.0") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")