From b6e76301652aea2c8a8d0b8c3416eded317a2358 Mon Sep 17 00:00:00 2001 From: Yuriy Mazepin Date: Fri, 23 Feb 2024 09:50:38 +0200 Subject: [PATCH] update deps --- bench/src/main/scala-2.13/data.scala | 4 ++-- bench/src/main/scala-2.13/msg.scala | 4 ++-- build.sbt | 8 ++++---- project/build.properties | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bench/src/main/scala-2.13/data.scala b/bench/src/main/scala-2.13/data.scala index 55eff82..07cf399 100644 --- a/bench/src/main/scala-2.13/data.scala +++ b/bench/src/main/scala-2.13/data.scala @@ -80,8 +80,8 @@ object States { val data = Data(value=value, lastModified=lastModified, vc=vc) import proto.encode import proto.macrosapi.caseCodecIdx - implicit val vCodec = caseCodecIdx[Version] - implicit val vcCodec = caseCodecIdx[VectorClock] + implicit val vCodec: MessageCodec[Version] = caseCodecIdx + implicit val vcCodec: MessageCodec[VectorClock] = caseCodecIdx val codec = caseCodecIdx[Data] val bytes: Array[Byte] = encode(data)(codec) } diff --git a/bench/src/main/scala-2.13/msg.scala b/bench/src/main/scala-2.13/msg.scala index 3c12057..3c400a6 100644 --- a/bench/src/main/scala-2.13/msg.scala +++ b/bench/src/main/scala-2.13/msg.scala @@ -28,8 +28,8 @@ object States { class MacrosState { val msg = Msg(Stat("cpu", "0.45"), StatMeta("1571067208996", "127.0.0.1:8080")) import proto.macrosapi.caseCodecIdx - implicit val sCodec = caseCodecIdx[Stat] - implicit val smCodec = caseCodecIdx[StatMeta] + implicit val sCodec: MessageCodec[Stat] = caseCodecIdx + implicit val smCodec: MessageCodec[StatMeta] = caseCodecIdx val codec = caseCodecIdx[Msg] val bytes: Array[Byte] = encode(msg)(codec) } diff --git a/build.sbt b/build.sbt index 4102c60..d626662 100644 --- a/build.sbt +++ b/build.sbt @@ -9,14 +9,14 @@ ThisBuild / crossScalaVersions := "3.3.1" :: "2.13.12" :: "2.12.18" :: Nil lazy val proto = project.in(file("proto")).settings( name := "proto", version := zero.git.version(), - libraryDependencies += "com.google.protobuf" % "protobuf-java" % "3.23.3", - libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.16" % Test + libraryDependencies += "com.google.protobuf" % "protobuf-java" % "3.25.3", + libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.18" % Test ).dependsOn(protoops) lazy val protopurs = project.in(file("purs")).settings( name := "proto-purs" , version := zero.git.version() -, libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.16" % Test +, libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.18" % Test ).dependsOn(protoops, proto % Test) lazy val prototex = project.in(file("tex")).settings( @@ -43,7 +43,7 @@ lazy val protosyntax = project.in(file("syntax")).settings( lazy val bench = project.in(file("bench")).settings( publish / skip := true -, libraryDependencies += "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.14.0" +, libraryDependencies += "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.16.1" , libraryDependencies ++= { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 13)) => Seq( diff --git a/project/build.properties b/project/build.properties index 8cf07b7..4d5f78c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 \ No newline at end of file +sbt.version=1.9.9 \ No newline at end of file