diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fceab7b7c..0a3d5021c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.17, 2.13.7] + scala: [2.12.17, 2.13.10] java: [adopt@1.8] platform: [jvm, js, native] runs-on: ${{ matrix.os }} @@ -75,7 +75,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7] + scala: [2.13.10] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 9457a7896..0523a174c 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ import com.typesafe.sbt.SbtGit.GitKeys._ import sbtcrossproject.CrossProject val Scala212 = "2.12.17" -val Scala213 = "2.13.7" +val Scala213 = "2.13.10" commonSettings noPublishSettings diff --git a/examples/src/main/scala/shapeless/examples/alacache.scala b/examples/src/main/scala/shapeless/examples/alacache.scala index 0c83723ee..adf22357f 100644 --- a/examples/src/main/scala/shapeless/examples/alacache.scala +++ b/examples/src/main/scala/shapeless/examples/alacache.scala @@ -20,10 +20,8 @@ package examples import java.lang.ref.WeakReference import java.util.logging.Logger import scala.reflect.ClassTag - -import ops.hlist.{ Length, Tupler } +import ops.hlist.{Length, Tupler} import ops.nat.ToInt - import test._ import java.util.WeakHashMap @@ -186,11 +184,7 @@ trait CachedCaseClassDefns extends } -/** - * Demo of a Shapeless a la carte case class with interning. - * - * shapeless-examples/runMain shapeless.examples.ALaCacheDemo - */ + object ALaCacheDemo extends App { object FooDefns extends CachedCaseClassDefns { type C = Foo @@ -237,7 +231,7 @@ object ALaCacheDemo extends App { assert("foo" == foo_2) val fooIterator = foo.productIterator - assert(List(23, "foo") == fooIterator.toList) + assert((List(23, "foo"): List[Any]) == fooIterator.toList) val fooPrefix = foo.productPrefix assert("Foo" == fooPrefix) diff --git a/examples/src/main/scala/shapeless/examples/alacarte.scala b/examples/src/main/scala/shapeless/examples/alacarte.scala index d2ba97432..015eb0b10 100644 --- a/examples/src/main/scala/shapeless/examples/alacarte.scala +++ b/examples/src/main/scala/shapeless/examples/alacarte.scala @@ -29,7 +29,6 @@ import test._ // productElements and related methods (or replace with typed alternatives). // // Note that no new macros were required for the creation of this library. - object ALaCarteDemo extends App { // Minimal boilerplate required for Foo to emulate a standard // Scala case class ... @@ -65,7 +64,7 @@ object ALaCarteDemo extends App { assert("foo" == foo_2) val fooIterator = foo.productIterator - assert(List(23, "foo") == fooIterator.toList) + assert((List(23, "foo"): List[Any]) == fooIterator.toList) val fooPrefix = foo.productPrefix assert("Foo" == fooPrefix)