Skip to content

Commit

Permalink
Upgrade scala-library from 2.13.6 to 2.13.8 (#168)
Browse files Browse the repository at this point in the history
Co-authored-by: scala-steward <162267+scala-steward-for-moia[bot]@users.noreply.github.com>
Co-authored-by: Alex Weber <lexwbr@gmail.com>
  • Loading branch information
3 people committed Mar 7, 2022
1 parent eca21d5 commit 0348d86
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -80,7 +80,7 @@ case class ModelLarger(
baz: Option[String],
ranges: List[SubModel],
doubleSub: SubModel,
enum: ModelEnum
`enum`: ModelEnum
)

object Protobuf {
Expand Down

0 comments on commit 0348d86

Please sign in to comment.