From 79bca3314352ae6590f4e73da3e3ff141f0fccfd 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, 6 May 2024 14:13:12 +0000 Subject: [PATCH] Upgrade scala-library from 2.13.13 to 2.13.14 (#328) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- build.sbt | 4 ++-- .../protos/teleproto/HierarchicalProtocolBuffersTest.scala | 4 ---- .../teleproto/ProtocolBuffersMigrationHierarchyTest.scala | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index d190eec..a4ce908 100644 --- a/build.sbt +++ b/build.sbt @@ -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" } @@ -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 diff --git a/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala b/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala index 31fe515..5f98448 100644 --- a/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala +++ b/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala @@ -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. */ @@ -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") @@ -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!") diff --git a/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala b/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala index 9826537..1686c33 100644 --- a/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala +++ b/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala @@ -1,7 +1,5 @@ package io.moia.protos.teleproto -import scala.annotation.nowarn - object ProtocolBuffersMigrationHierarchyTest { // V2 @@ -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))