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 7d805caac..604d9a387 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 @@ -184,7 +184,7 @@ lazy val examples = crossProject(JSPlatform, JVMPlatform, NativePlatform) .configureCross(configureJUnit) .dependsOn(core) .settings(moduleName := "examples") - .settings(libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.1.1") + .settings(libraryDependencies += "org.scala-lang.modules" %%% "scala-parser-combinators" % "2.2.0") .settings(runAllIn(Compile)) .settings(commonSettings) .settings(noPublishSettings) diff --git a/core/shared/src/main/scala/shapeless/ops/coproduct.scala b/core/shared/src/main/scala/shapeless/ops/coproduct.scala index d0d97a1cc..dddd1faf7 100644 --- a/core/shared/src/main/scala/shapeless/ops/coproduct.scala +++ b/core/shared/src/main/scala/shapeless/ops/coproduct.scala @@ -43,7 +43,7 @@ object coproduct { } /** - * Type class for attempting to get a value of type T out of an instance of corpdocut C. + * Type class for attempting to get a value of type T out of an instance of coproduct C. * If the coproduct instance is not of the specified type, None is returned */ trait Selector[C <: Coproduct, T] extends Serializable { 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) diff --git a/project/build.properties b/project/build.properties index 6a9f03889..46e43a97e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.3 +sbt.version=1.8.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 7cc8154e7..cc44b4cb6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,13 +1,13 @@ scalacOptions += "-deprecation" -libraryDependencies += "org.slf4j" % "slf4j-nop" % "2.0.3" +libraryDependencies += "org.slf4j" % "slf4j-nop" % "2.0.6" addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1") addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.10") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0") addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")