Skip to content

Commit

Permalink
remedy build failure with Scala 2.13.10 (#1300)
Browse files Browse the repository at this point in the history
  • Loading branch information
fordm authored Feb 17, 2023
1 parent 23d3104 commit da31ece
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [[email protected]]
platform: [jvm, js, native]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.7]
scala: [2.13.10]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 3 additions & 9 deletions examples/src/main/scala/shapeless/examples/alacache.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions examples/src/main/scala/shapeless/examples/alacarte.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 ...
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit da31ece

Please sign in to comment.