Skip to content

Commit e86b3bb

Browse files
committed
Merge branch '2.12' into dotty
2 parents a8a7990 + 9a56d6e commit e86b3bb

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/test/scala/com/fasterxml/jackson/module/scala/JacksonTest.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,4 @@ abstract class JacksonTest extends BaseSpec {
1111
}
1212

1313
def newMapper: ObjectMapper = newBuilder.build()
14-
15-
def newMapperWithScalaObjectMapper: ObjectMapper with ScalaObjectMapper = {
16-
newBuilder.build() :: ScalaObjectMapper
17-
}
1814
}

src/test/scala/com/fasterxml/jackson/module/scala/introspect/ScalaAnnotationIntrospectorTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ object ScalaAnnotationIntrospectorTest {
3232
class ScalaAnnotationIntrospectorTest extends FixtureAnyFlatSpec with Matchers {
3333
import ScalaAnnotationIntrospectorTest._
3434

35-
type FixtureParam = ObjectMapper with ScalaObjectMapper
35+
type FixtureParam = ObjectMapper
3636

3737
override def withFixture(test: OneArgTest): Outcome = {
38-
val mapper = new ObjectMapper with ScalaObjectMapper
38+
val mapper = new ObjectMapper
3939
mapper.registerModule(DefaultScalaModule)
4040
withFixture(test.toNoArgTest(mapper))
4141
}

0 commit comments

Comments
 (0)