upgrade to Scala 3 to 3.3

zio · Aug 2, 2023 · da8d929 · da8d929
1 parent 26bb289
commit da8d929
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
  fail-fast: false
  matrix:
  java: ['adopt@1.8', 'adopt@1.11']
- scala: ['2.12.17', '2.13.8', '3.2.1']
+ scala: ['2.12.17', '2.13.8', '3.3.0']
  steps:
  - uses: actions/checkout@v3.0.0
  with:

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -23,7 +23,7 @@ object BuildHelper {
 
  val Scala212: String = versions("2.12")
  val Scala213: String = versions("2.13")
- val Scala3: String = versions("3.2") //versions.getOrElse("3.0", versions("3.1"))
+ val Scala3: String = versions("3.3") //versions.getOrElse("3.0", versions("3.1"))
 
  val zioVersion = "2.0.10"
  val zioJsonVersion = "0.5.0"

diff --git a/zio-schema-derivation/shared/src/main/scala-3/zio/schema/Derive.scala b/zio-schema-derivation/shared/src/main/scala-3/zio/schema/Derive.scala
@@ -14,7 +14,9 @@ object Derive {
  DeriveInstance().deriveInstance[F, A](deriver, schema, top = true)
 }
 
-private case class DeriveInstance()(using val ctx: Quotes) extends ReflectionUtils(ctx) {
+private case class DeriveInstance()(using val ctx: Quotes) {
+ val reflectionUtils = ReflectionUtils(ctx)
+ import reflectionUtils.{MirrorType, Mirror, summonOptional}
  import ctx.reflect._
 
  case class Frame(ref: Term, tpe: TypeRepr)

diff --git a/zio-schema-derivation/shared/src/main/scala-3/zio/schema/DeriveSchema.scala b/zio-schema-derivation/shared/src/main/scala-3/zio/schema/DeriveSchema.scala
@@ -18,9 +18,11 @@ object DeriveSchema {
  DeriveSchema().deriveSchema[T](top = true)
 }
 
-private case class DeriveSchema()(using val ctx: Quotes) extends ReflectionUtils(ctx) {
+private case class DeriveSchema()(using val ctx: Quotes) {
+ val reflectionUtils = ReflectionUtils(ctx)
+ import reflectionUtils.{MirrorType, Mirror}
  import ctx.reflect._
- 
+
  case class Frame(ref: Term, tpe: TypeRepr)
  case class Stack(frames: List[Frame]) {
  def find(tpe: TypeRepr): Option[Term] = frames.find(_.tpe =:= tpe).map(_.ref)