Upgraded to 2.13.0-M5

.travis.yml

@@ -8,12 +8,12 @@ cache:
 language: scala
 
 scala:
-  - 2.11.11
-  - 2.12.7
-  - 2.13.0-M4
+  - 2.11.12
+  - 2.12.8
+  - 2.13.0-M5
 
 jdk:
-  - oraclejdk8
+  - openjdk11
 
 script:
   - node -v

build.sbt

@@ -7,12 +7,11 @@ val commonSettings = Seq(
   rootPackage := "scodec",
   scmInfo := Some(ScmInfo(url("https://github.com/scodec/scodec"), "git@github.com:scodec/scodec.git")),
   contributors ++= Seq(Contributor("mpilquist", "Michael Pilquist"), Contributor("pchiusano", "Paul Chiusano")),
-  crossScalaVersions := "2.10.6" +: crossScalaVersions.value.filterNot(_.startsWith("2.10.")).filterNot(_.startsWith("2.13.")),
   releaseCrossBuild := true,
   scalacOptions --= {
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, v)) if v >= 13 =>
-        Seq("-Yno-adapted-args")
+        Seq("-Yno-adapted-args", "-Ywarn-unused-import")
       case _ =>
         Seq()
     }
@@ -67,7 +66,7 @@ lazy val testkit = crossProject(JVMPlatform, JSPlatform).in(file("testkit")).
       "org.scodec" %%% "scodec-bits" % "1.1.9",
       "com.chuusai" %%% "shapeless" % "2.3.3",
       "org.scalacheck" %%% "scalacheck" % "1.14.0",
-      "org.scalatest" %%% "scalatest" % "3.0.6-SNAP1"
+      "org.scalatest" %%% "scalatest" % "3.0.6-SNAP5"
     )
   ).
   jsSettings(commonJsSettings: _*).

project/plugins.sbt

@@ -1,5 +1,5 @@
 resolvers += "Sonatype Public" at "https://oss.sonatype.org/content/groups/public/"
 
-addSbtPlugin("org.scodec" % "scodec-build" % "1.11.0")
+addSbtPlugin("org.scodec" % "scodec-build" % "1.11.1")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")

unitTests/src/test/scala/scodec/codecs/ChecksumCodecTest.scala

@@ -8,8 +8,8 @@ class ChecksumCodecTest extends CodecSuite {
   "checksummed codec" should {
     def xor(length: Long) = (bits: BitVector) => bits.grouped(length).foldLeft(BitVector.low(length))(_ xor _)
 
-    val codecSizeIncluded = checksummed(utf8_32, xor(8), peekVariableSizeBytes(int32) ~ bits)
-    val codecSizeExcluded = checksummed(utf8, xor(8), variableSizeBytes(int32, bits) ~ bits)
+    val codecSizeIncluded = checksummed(utf8_32, xor(8), peekVariableSizeBytes(int32) ~ codecs.bits)
+    val codecSizeExcluded = checksummed(utf8, xor(8), variableSizeBytes(int32, codecs.bits) ~ codecs.bits)
 
     "roundtrip" in {
       forAll { (s: String) => roundtrip(codecSizeIncluded, s) }
@@ -38,7 +38,7 @@ class ChecksumCodecTest extends CodecSuite {
       val crc32c = crc(hex"1edc6f41".bits, hex"ffffffff".bits, true, true, hex"ffffffff".bits)
       def swap(c: Codec[(BitVector, BitVector)]): Codec[(BitVector, BitVector)] =
         c.xmap(_.swap, _.swap)
-      val codec = checksummed(utf8_32, crc32c, swap(bits(32) ~ bits))
+      val codec = checksummed(utf8_32, crc32c, swap(codecs.bits(32) ~ codecs.bits))
       codec.encode("hello world").require shouldBe hex"edbbac630000000b68656c6c6f20776f726c64".bits
     }
   }