From 61b33729b55714b8c476d7cabf5d8ce9e4352f1b Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Thu, 20 May 2021 20:18:36 +0300 Subject: [PATCH] Scala 3.0, Shapeless 3.0 and other dependencies --- build.sbt | 14 +++++++------- .../cats/derived/all.scala | 0 .../cats/derived/commutativeMonoid.scala | 0 .../cats/derived/commutativeSemigroup.scala | 0 .../cats/derived/empty.scala | 0 .../cats/derived/emptyk.scala | 0 .../cats/derived/eq.scala | 0 .../cats/derived/foldable.scala | 0 .../cats/derived/functor.scala | 0 .../cats/derived/hash.scala | 0 .../cats/derived/monoid.scala | 0 .../cats/derived/monoidk.scala | 0 .../cats/derived/order.scala | 0 .../cats/derived/package.scala | 0 .../cats/derived/partialOrder.scala | 0 .../cats/derived/semigroup.scala | 0 .../cats/derived/semigroupk.scala | 0 .../cats/derived/show.scala | 0 .../cats/derived/traverse.scala | 0 19 files changed, 7 insertions(+), 7 deletions(-) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/all.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/commutativeMonoid.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/commutativeSemigroup.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/empty.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/emptyk.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/eq.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/foldable.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/functor.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/hash.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/monoid.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/monoidk.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/order.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/package.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/partialOrder.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/semigroup.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/semigroupk.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/show.scala (100%) rename core/src/main/{scala-3.0.0-RC3 => scala-3}/cats/derived/traverse.scala (100%) diff --git a/build.sbt b/build.sbt index 2c318ee3..e029590f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ import sbt._ val scala212 = "2.12.13" -val scala213 = "2.13.5" -val scala3 = "3.0.0-RC3" +val scala213 = "2.13.6" +val scala3 = "3.0.0" ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3) ThisBuild / scalaVersion := scala3 @@ -11,11 +11,11 @@ lazy val buildSettings = Seq( organization := "org.typelevel" ) -val catsVersion = "2.6.0" -val disciplineMunitVersion = "1.0.8" -val kindProjectorVersion = "0.11.3" -val shapeless2Version = "2.3.5" -val shapeless3Version = "3.0.0-M4" +val catsVersion = "2.6.1" +val disciplineMunitVersion = "1.0.9" +val kindProjectorVersion = "0.13.0" +val shapeless2Version = "2.3.7" +val shapeless3Version = "3.0.0" lazy val commonSettings = Seq( scalacOptions := Seq( diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/all.scala b/core/src/main/scala-3/cats/derived/all.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/all.scala rename to core/src/main/scala-3/cats/derived/all.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/commutativeMonoid.scala b/core/src/main/scala-3/cats/derived/commutativeMonoid.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/commutativeMonoid.scala rename to core/src/main/scala-3/cats/derived/commutativeMonoid.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/commutativeSemigroup.scala b/core/src/main/scala-3/cats/derived/commutativeSemigroup.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/commutativeSemigroup.scala rename to core/src/main/scala-3/cats/derived/commutativeSemigroup.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/empty.scala b/core/src/main/scala-3/cats/derived/empty.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/empty.scala rename to core/src/main/scala-3/cats/derived/empty.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/emptyk.scala b/core/src/main/scala-3/cats/derived/emptyk.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/emptyk.scala rename to core/src/main/scala-3/cats/derived/emptyk.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/eq.scala b/core/src/main/scala-3/cats/derived/eq.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/eq.scala rename to core/src/main/scala-3/cats/derived/eq.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/foldable.scala b/core/src/main/scala-3/cats/derived/foldable.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/foldable.scala rename to core/src/main/scala-3/cats/derived/foldable.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/functor.scala b/core/src/main/scala-3/cats/derived/functor.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/functor.scala rename to core/src/main/scala-3/cats/derived/functor.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/hash.scala b/core/src/main/scala-3/cats/derived/hash.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/hash.scala rename to core/src/main/scala-3/cats/derived/hash.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/monoid.scala b/core/src/main/scala-3/cats/derived/monoid.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/monoid.scala rename to core/src/main/scala-3/cats/derived/monoid.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/monoidk.scala b/core/src/main/scala-3/cats/derived/monoidk.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/monoidk.scala rename to core/src/main/scala-3/cats/derived/monoidk.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/order.scala b/core/src/main/scala-3/cats/derived/order.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/order.scala rename to core/src/main/scala-3/cats/derived/order.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/package.scala b/core/src/main/scala-3/cats/derived/package.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/package.scala rename to core/src/main/scala-3/cats/derived/package.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/partialOrder.scala b/core/src/main/scala-3/cats/derived/partialOrder.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/partialOrder.scala rename to core/src/main/scala-3/cats/derived/partialOrder.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/semigroup.scala b/core/src/main/scala-3/cats/derived/semigroup.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/semigroup.scala rename to core/src/main/scala-3/cats/derived/semigroup.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/semigroupk.scala b/core/src/main/scala-3/cats/derived/semigroupk.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/semigroupk.scala rename to core/src/main/scala-3/cats/derived/semigroupk.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/show.scala b/core/src/main/scala-3/cats/derived/show.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/show.scala rename to core/src/main/scala-3/cats/derived/show.scala diff --git a/core/src/main/scala-3.0.0-RC3/cats/derived/traverse.scala b/core/src/main/scala-3/cats/derived/traverse.scala similarity index 100% rename from core/src/main/scala-3.0.0-RC3/cats/derived/traverse.scala rename to core/src/main/scala-3/cats/derived/traverse.scala