From ad232115bd1d056250a531600eea5bacb69a115b Mon Sep 17 00:00:00 2001 From: scala-steward <162267+scala-steward-for-moia[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 09:11:39 +0000 Subject: [PATCH 1/6] Upgrade scala-library from 2.13.13 to 2.13.14 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d190eec..f42217c 100644 --- a/build.sbt +++ b/build.sbt @@ -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 From d9bc4e7fdb9a4f866b7feb77a8934e45da645692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bendix=20S=C3=A4ltz?= Date: Mon, 6 May 2024 16:01:23 +0200 Subject: [PATCH 2/6] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f42217c..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" } From 454e43a4def25fabbcfd1f38c695fe0cf5b9afcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bendix=20S=C3=A4ltz?= Date: Mon, 6 May 2024 16:08:31 +0200 Subject: [PATCH 3/6] Update HierarchicalProtocolBuffersTest.scala --- .../moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala b/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala index 31fe515..f3df930 100644 --- a/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala +++ b/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala @@ -89,7 +89,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 +111,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!") From 34cec9480d96ae3f26060f0dbe1e567b960d2a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bendix=20S=C3=A4ltz?= Date: Mon, 6 May 2024 16:08:52 +0200 Subject: [PATCH 4/6] Update ProtocolBuffersMigrationHierarchyTest.scala --- .../protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala b/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala index 9826537..c97035d 100644 --- a/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala +++ b/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala @@ -61,7 +61,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)) From 991106a913426e9b9fabf88097a490b4e53bb49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bendix=20S=C3=A4ltz?= Date: Mon, 6 May 2024 16:11:03 +0200 Subject: [PATCH 5/6] Update HierarchicalProtocolBuffersTest.scala --- .../moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala b/src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala index f3df930..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. */ From f1fd43fbbd4916bbd2619c02b38dfc355e627bbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bendix=20S=C3=A4ltz?= Date: Mon, 6 May 2024 16:11:17 +0200 Subject: [PATCH 6/6] Update ProtocolBuffersMigrationHierarchyTest.scala --- .../teleproto/ProtocolBuffersMigrationHierarchyTest.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala b/src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala index c97035d..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