From 0348d866f6546d0939d852334f466cd106c6ccad Mon Sep 17 00:00:00 2001 From: "scala-steward-for-moia[bot]" <97042238+scala-steward-for-moia[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 11:20:14 +0100 Subject: [PATCH] Upgrade scala-library from 2.13.6 to 2.13.8 (#168) Co-authored-by: scala-steward <162267+scala-steward-for-moia[bot]@users.noreply.github.com> Co-authored-by: Alex Weber --- build.sbt | 4 ++-- .../protos/teleproto/ProtocolBuffersEnumMigrationTest.scala | 4 ++-- .../io/moia/protos/teleproto/ProtocolBuffersTest.scala | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index f8edbb4..eafb8bd 100644 --- a/build.sbt +++ b/build.sbt @@ -39,7 +39,7 @@ lazy val library = new { val scalaCheck = "1.15.4" val scalaTest = "3.2.11" val scalaTestPlusCheck = "3.2.2.0" - val scapeGoat = "1.4.11" + val scapeGoat = "1.4.12" } val scalaPB = "com.thesamet.scalapb" %% "scalapb-runtime" % Version.scalaPB @@ -66,7 +66,7 @@ lazy val commonSettings = Seq.concat( lazy val compilerSettings = Seq( scalaVersion := crossScalaVersions.value.head, - crossScalaVersions := List("2.13.6", "2.12.15"), + crossScalaVersions := List("2.13.8", "2.12.15"), Compile / packageBin / mappings += (ThisBuild / baseDirectory).value / "LICENSE" -> "LICENSE", scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 12)) => scalacOptions_2_12 diff --git a/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersEnumMigrationTest.scala b/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersEnumMigrationTest.scala index 23b9d1d..b4b6948 100644 --- a/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersEnumMigrationTest.scala +++ b/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersEnumMigrationTest.scala @@ -3,8 +3,8 @@ package io.moia.protos.teleproto import io.moia.migration.migration.{V1, V2, V3} object ProtocolBuffersEnumMigrationTest { - case class MessageV2(enum: V2.Enum) - case class MessageV3(enum: V3.Enum) + case class MessageV2(`enum`: V2.Enum) + case class MessageV3(`enum`: V3.Enum) implicit val fromV1toV2: Migration[V1.Enum, V2.Enum] = ProtocolBuffers.migration[V1.Enum, V2.Enum]() implicit val fromV2toV3: Migration[V2.Enum, V3.Enum] = ProtocolBuffers.migration[V2.Enum, V3.Enum]() diff --git a/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersTest.scala b/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersTest.scala index 5f724de..8d06384 100644 --- a/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersTest.scala +++ b/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersTest.scala @@ -46,7 +46,7 @@ case class Protobuf( pickupId: Option[String] = None, ranges: Seq[SubProtobuf] = Seq.empty, doubleSub: Option[SubProtobuf] = None, - enum: ProtobufEnum = ProtobufEnum.FirstCase + `enum`: ProtobufEnum = ProtobufEnum.FirstCase ) sealed trait ModelEnum @@ -65,7 +65,7 @@ case class Model( pickupId: Option[String], ranges: List[SubModel], doubleSub: SubModel, - enum: ModelEnum + `enum`: ModelEnum ) case class ModelSmaller(id: String, price: BigDecimal) @@ -80,7 +80,7 @@ case class ModelLarger( baz: Option[String], ranges: List[SubModel], doubleSub: SubModel, - enum: ModelEnum + `enum`: ModelEnum ) object Protobuf {