From f375ca336083f7ff45386e604431dac6fef8a507 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Mon, 25 Dec 2023 14:11:56 +0900 Subject: [PATCH] add `-Xsource:3` --- build.sbt | 8 ++++++++ jvm/src/test/scala/msgpack4z/JavaSpec.scala | 2 +- src/test/scala/msgpack4z/NativeSpec.scala | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 80a5a4d..86543c2 100644 --- a/build.sbt +++ b/build.sbt @@ -91,6 +91,14 @@ val commonSettings = Def.settings( Nil } }, + scalacOptions ++= { + CrossVersion.partialVersion(scalaVersion.value) match { + case Some((2, _)) => + Seq("-Xsource:3") + case _ => + Nil + } + }, scalacOptions ++= unusedWarnings, scalaVersion := scala212, crossScalaVersions := scala212 :: "2.13.12" :: "3.3.1" :: Nil, diff --git a/jvm/src/test/scala/msgpack4z/JavaSpec.scala b/jvm/src/test/scala/msgpack4z/JavaSpec.scala index 3328f48..c56bbd9 100644 --- a/jvm/src/test/scala/msgpack4z/JavaSpec.scala +++ b/jvm/src/test/scala/msgpack4z/JavaSpec.scala @@ -1,6 +1,6 @@ package msgpack4z object JavaSpec extends SpecBase { - override protected[this] def packer() = new MsgpackJavaPacker() + override protected[this] def packer(): MsgPacker = new MsgpackJavaPacker() override protected[this] def unpacker(bytes: Array[Byte]) = MsgpackJavaUnpacker.defaultUnpacker(bytes) } diff --git a/src/test/scala/msgpack4z/NativeSpec.scala b/src/test/scala/msgpack4z/NativeSpec.scala index 6130d40..aeb2410 100644 --- a/src/test/scala/msgpack4z/NativeSpec.scala +++ b/src/test/scala/msgpack4z/NativeSpec.scala @@ -1,6 +1,6 @@ package msgpack4z object NativeSpec extends SpecBase { - override protected[this] def packer() = MsgOutBuffer.create() - override protected[this] def unpacker(bytes: Array[Byte]) = MsgInBuffer(bytes) + override protected[this] def packer(): MsgPacker = MsgOutBuffer.create() + override protected[this] def unpacker(bytes: Array[Byte]): MsgUnpacker = MsgInBuffer(bytes) }