Skip to content

Commit

Permalink
Upgrade scala-library from 2.13.13 to 2.13.14 (#328)
Browse files Browse the repository at this point in the history
* Upgrade scala-library from 2.13.13 to 2.13.14

* Update build.sbt

* Update HierarchicalProtocolBuffersTest.scala

* Update ProtocolBuffersMigrationHierarchyTest.scala

* Update HierarchicalProtocolBuffersTest.scala

* Update ProtocolBuffersMigrationHierarchyTest.scala

---------

Co-authored-by: scala-steward <162267+scala-steward-for-moia[bot]@users.noreply.github.com>
Co-authored-by: Bendix Sältz <[email protected]>
  • Loading branch information
3 people authored May 6, 2024
1 parent da1b2ea commit 79bca33
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 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.18.0"
val scalaTest = "3.2.18"
val scalaTestPlusCheck = "3.2.14.0"
val scapeGoat = "2.1.5"
val scapeGoat = "2.1.6"
val scalaCollectionCompat = "2.12.0"
}

Expand Down Expand Up @@ -68,7 +68,7 @@ lazy val commonSettings = Seq.concat(

lazy val compilerSettings = Seq(
scalaVersion := crossScalaVersions.value.head,
crossScalaVersions := List("2.13.13", "2.12.19"),
crossScalaVersions := List("2.13.14", "2.12.19"),
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 @@ -2,8 +2,6 @@ package io.moia.protos.teleproto

import scalapb.GeneratedOneof

import scala.annotation.nowarn

/** Tests correct behaviour of generated mappings regarding hierarchical types where a reader/writer for an inner case class can be
* generated, too.
*/
Expand Down Expand Up @@ -89,7 +87,6 @@ class HierarchicalProtocolBuffersTest extends UnitTest {

"use an 'explicit' implicit writer before generating a writer for a type in hierarchy of a generated type pair" in {

@nowarn("cat=unused")
implicit val explicitQuxWriter: Writer[model.Qux, protobuf.Qux] =
(p: model.Qux) => protobuf.Qux("other text")

Expand All @@ -112,7 +109,6 @@ class HierarchicalProtocolBuffersTest extends UnitTest {

"use an 'explicit' implicit reader before generating a reader for a type in hierarchy of a generated type pair" in {

@nowarn("cat=unused")
implicit val explicitQuxReader: Reader[protobuf.Qux, model.Qux] =
(p: protobuf.Qux) => PbFailure("Used the 'explicit' implicit!")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package io.moia.protos.teleproto

import scala.annotation.nowarn

object ProtocolBuffersMigrationHierarchyTest {

// V2
Expand Down Expand Up @@ -61,7 +59,6 @@ class ProtocolBuffersMigrationHierarchyTest extends UnitTest {

"prefer a custom nested migration over a generated" in {

@nowarn("cat=unused")
implicit val upperCasingMatchingSubProtoV1toV2: Migration[MatchingSubProtoV1, MatchingSubProtoV2] =
Migration[MatchingSubProtoV1, MatchingSubProtoV2](src => MatchingSubProtoV2(src.same.toUpperCase))

Expand Down

0 comments on commit 79bca33

Please sign in to comment.