Skip to content

Commit b788a2e

Browse files
benjaminpluben
authored andcommitted
Upgrade scala.
1 parent 3106093 commit b788a2e

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version := {
66
scala.io.Source.fromFile("version").getLines.next
77
}
88

9-
scalaVersion := "2.12.15"
9+
scalaVersion := "2.13.8"
1010

1111
enablePlugins(JniPlugin, SbtOsgi)
1212

@@ -19,7 +19,7 @@ logBuffered in Test := false
1919
parallelExecution in Test := false
2020

2121
libraryDependencies ++= Seq(
22-
"org.scalatest" %% "scalatest" % "3.0.5" % "test",
22+
"org.scalatest" %% "scalatest" % "3.0.9" % "test",
2323
"org.scalacheck" %% "scalacheck" % "1.15.4" % "test"
2424
)
2525

src/test/scala/Zstd.scala

+13-13
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ class ZstdSpec extends FlatSpec with Checkers {
441441
pos += zis.read(buff, pos, length - pos)
442442
}
443443

444-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
444+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
445445
if(original != buff.toSeq)
446446
sys.error(s"Failed")
447447
assert(zis.available == 0)
@@ -463,7 +463,7 @@ class ZstdSpec extends FlatSpec with Checkers {
463463
pos += zis.read(buff, pos, toRead)
464464
}
465465

466-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
466+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
467467
if(original != buff.toSeq)
468468
sys.error(s"Failed")
469469
}
@@ -483,7 +483,7 @@ class ZstdSpec extends FlatSpec with Checkers {
483483
pos += zis.read(buff, pos, length - pos)
484484
}
485485

486-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
486+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
487487
if(original != buff.toSeq)
488488
sys.error(s"Failed")
489489
assert(zis.available == 0)
@@ -510,7 +510,7 @@ class ZstdSpec extends FlatSpec with Checkers {
510510
pos += 1
511511
}
512512

513-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
513+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
514514
if(original != buff.toSeq)
515515
sys.error(s"Failed")
516516
}
@@ -547,7 +547,7 @@ class ZstdSpec extends FlatSpec with Checkers {
547547
block.flip()
548548
block.get(buff)
549549

550-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
550+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
551551
if(original != buff.toSeq)
552552
sys.error(s"Failed")
553553
}
@@ -571,7 +571,7 @@ class ZstdSpec extends FlatSpec with Checkers {
571571
window.flip()
572572
window.get(buff)
573573

574-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
574+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
575575
if(original != buff.toSeq)
576576
sys.error(s"Failed")
577577
}
@@ -619,7 +619,7 @@ class ZstdSpec extends FlatSpec with Checkers {
619619
window.flip()
620620
window.get(buff)
621621

622-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
622+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
623623
if(original != buff.toSeq)
624624
sys.error(s"Failed")
625625
}
@@ -667,7 +667,7 @@ class ZstdSpec extends FlatSpec with Checkers {
667667
val buff = new Array[Byte](result.remaining())
668668
result.get(buff)
669669

670-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
670+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
671671
if(original != buff.toSeq)
672672
sys.error(s"Failed")
673673
}
@@ -722,7 +722,7 @@ class ZstdSpec extends FlatSpec with Checkers {
722722
zos.close()
723723

724724
val compressed = os.toByteArray.toSeq
725-
val zst = Source.fromFile(s"src/test/resources/xml-$level.zst")(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
725+
val zst = Source.fromFile(s"src/test/resources/xml-$level.zst")(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
726726

727727
if (zst != compressed) {
728728
sys.error(s"Failed original ${zst.length} != ${compressed.length} result")
@@ -745,7 +745,7 @@ class ZstdSpec extends FlatSpec with Checkers {
745745

746746
val compressed = new Array[Byte](target.limit())
747747
target.get(compressed)
748-
val zst = Source.fromFile(s"src/test/resources/xml-$level.zst")(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
748+
val zst = Source.fromFile(s"src/test/resources/xml-$level.zst")(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
749749

750750
if (zst != compressed.toSeq) {
751751
sys.error(s"Failed original ${zst.length} != ${compressed.length} result")
@@ -779,7 +779,7 @@ class ZstdSpec extends FlatSpec with Checkers {
779779

780780
val compressed = new Array[Byte](target.limit())
781781
target.get(compressed)
782-
val zst = Source.fromFile(s"src/test/resources/xml-$level.zst")(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
782+
val zst = Source.fromFile(s"src/test/resources/xml-$level.zst")(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
783783

784784
if (zst != compressed.toSeq) {
785785
sys.error(s"Failed original ${zst.length} != ${compressed.length} result")
@@ -803,7 +803,7 @@ class ZstdSpec extends FlatSpec with Checkers {
803803
pos += zis.read(buff, pos, length - pos)
804804
}
805805

806-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
806+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
807807
if(original != buff.toSeq)
808808
sys.error(s"Failed")
809809
assert(zis.available == 0)
@@ -825,7 +825,7 @@ class ZstdSpec extends FlatSpec with Checkers {
825825
pos += zis.read(buff, pos, length - pos)
826826
}
827827

828-
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to[WrappedArray]
828+
val original = Source.fromFile(orig)(Codec.ISO8859).map{char => char.toByte}.to(WrappedArray)
829829
if(original != buff.toSeq)
830830
sys.error(s"Failed")
831831
assert(zis.available == 0)

0 commit comments

Comments
 (0)