Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade scala-library from 2.13.13 to 2.13.14 #328

Merged
merged 7 commits into from
May 6, 2024
Merged

Upgrade scala-library from 2.13.13 to 2.13.14 #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad23211
Upgrade scala-library from 2.13.13 to 2.13.14
May 6, 2024
f12ddd6
Merge branch 'master' into update/scala-library-2.13.14
saeltz May 6, 2024
d9bc4e7
Update build.sbt
saeltz May 6, 2024
454e43a
Update HierarchicalProtocolBuffersTest.scala
saeltz May 6, 2024
34cec94
Update ProtocolBuffersMigrationHierarchyTest.scala
saeltz May 6, 2024
991106a
Update HierarchicalProtocolBuffersTest.scala
saeltz May 6, 2024
f1fd43f
Update ProtocolBuffersMigrationHierarchyTest.scala
saeltz May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
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
4 changes: 0 additions & 4 deletions src/test/scala/io/moia/protos/teleproto/HierarchicalProtocolBuffersTest.scala
View file
Open in desktop
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
3 changes: 0 additions & 3 deletions src/test/scala/io/moia/protos/teleproto/ProtocolBuffersMigrationHierarchyTest.scala
View file
Open in desktop
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