diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3d9997bb..8bcdb7fe 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,7 +31,7 @@ jobs: - "11" scala: - "2.11.12" - - "2.12.12" + - "2.12.14" test: runs-on: ubuntu-latest steps: @@ -49,7 +49,7 @@ jobs: - "8" - "11" scala: - - "2.12.12" + - "2.12.14" - "2.13.6" testWithCoverageReport: runs-on: ubuntu-latest diff --git a/build.sbt b/build.sbt index b4a69463..0cb705bd 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ def scalaVersionSpecificFolders(srcBaseDir: java.io.File, scalaVersion: String): val sharedSettings = mimaDefaultSettings ++ Seq( organization := "com.twitter", scalaVersion := "2.11.12", - crossScalaVersions := Seq("2.11.12", "2.12.12"), + crossScalaVersions := Seq("2.11.12", "2.12.14"), scalacOptions ++= Seq("-unchecked", "-deprecation"), scalacOptions ++= { scalaVersion.value match { diff --git a/chill-scala/src/main/scala-2.12-/com/twitter/chill/WrappedArraySerializer.scala b/chill-scala/src/main/scala-2.12-/com/twitter/chill/WrappedArraySerializer.scala index 77a9081c..54119cce 100644 --- a/chill-scala/src/main/scala-2.12-/com/twitter/chill/WrappedArraySerializer.scala +++ b/chill-scala/src/main/scala-2.12-/com/twitter/chill/WrappedArraySerializer.scala @@ -17,7 +17,7 @@ limitations under the License. package com.twitter.chill import scala.collection.mutable -import scala.collection.mutable.{WrappedArray, WrappedArrayBuilder} +import scala.collection.mutable.{ArrayBuilder, WrappedArray} import scala.reflect._ class WrappedArraySerializer[T] extends KSerializer[WrappedArray[T]] { @@ -33,7 +33,7 @@ class WrappedArraySerializer[T] extends KSerializer[WrappedArray[T]] { // uses the registration system, and this class might not be registered val clazz = kser.readObject(in, classOf[Class[T]]) val array = kser.readClassAndObject(in).asInstanceOf[Array[T]] - val bldr = new WrappedArrayBuilder[T](ClassTag[T](clazz)) + val bldr = ArrayBuilder.make[T]()(ClassTag[T](clazz)) bldr.sizeHint(array.size) bldr ++= array bldr.result()