Skip to content

Commit 4606351

Browse files
committed
Everything builds
1 parent 9fc573e commit 4606351

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

build.sc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ object versions {
1919
val scalaJSVersion = "1.10.1"
2020
val scalaNativeVersion = "0.4.4"
2121
val munitVersion = "0.7.29"
22+
val munitNativeVersion = "1.0.0-M6"
2223

2324
val scala213 = "2.13"
2425
val scala212 = "2.12"
@@ -150,7 +151,7 @@ trait RPCCrossPlatformModule extends Module { shared =>
150151
override def skipBloop = true
151152

152153
trait MunitTests extends Tests with TestModule.Munit {
153-
def ivyDeps = super.ivyDeps() ++ Agg(ivy"org.scalameta::munit::$munitVersion")
154+
def ivyDeps = super.ivyDeps() ++ Agg(ivy"org.scalameta::munit::$munitNativeVersion")
154155
}
155156

156157
trait Tests extends super.Tests with mill.contrib.Bloop.Module {

core/src/jsonrpclib/Channel.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ object Channel {
1818
template match {
1919
case StubTemplate.RequestResponseTemplate(method, inCodec, errCodec, outCodec) =>
2020
stub(method)(inCodec, errCodec, outCodec)
21-
case StubTemplate.NotificationTemplate(method, inCodec) =>
21+
case nt: StubTemplate.NotificationTemplate[in] =>
22+
val method = nt.method
23+
val inCodec = nt.inCodec
2224
val stub = notificationStub(method)(inCodec)
2325
(in: In) => F.doFlatMap(stub(in))(unit => F.doPure(Right(unit)))
2426
}

core/test/src-jvm-native/jsonrpclib/internals/HeaderSpec.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import munit.FunSuite
44
import java.io.ByteArrayInputStream
55
import java.io.BufferedReader
66
import java.io.InputStreamReader
7-
import java.util.stream.Collectors
87
import jsonrpclib.ProtocolError
9-
import scala.jdk.CollectionConverters._
108
import java.io.IOException
119
import java.io.UncheckedIOException
1210

0 commit comments

Comments
 (0)