fmtAll

build.sbt

@@ -20,7 +20,7 @@ inThisBuild(
         "scm:git:git@github.com:grouzen/zio-apache-parquet.git"
       )
     ),
-    crossScalaVersions                  := Seq(Scala213, Scala212, Scala3),
+    crossScalaVersions                  := Seq(Scala213, Scala3),
     ThisBuild / scalaVersion            := Scala3,
     githubWorkflowJavaVersions          := Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17")),
     githubWorkflowPublishTargetBranches := Seq(),

modules/core/src/main/scala-2.13/me/mnedokushev/zio/apache/parquet/core/filter/syntax.scala

@@ -1,8 +1,8 @@
 package me.mnedokushev.zio.apache.parquet.core.filter
 
-import me.mnedokushev.zio.apache.parquet.core.filter.internal.{ ColumnPathConcatMacro, SanitizeOptionalsMacro }
-import me.mnedokushev.zio.apache.parquet.core.filter.CompiledPredicate
 import me.mnedokushev.zio.apache.parquet.core.Lens
+import me.mnedokushev.zio.apache.parquet.core.filter.CompiledPredicate
+import me.mnedokushev.zio.apache.parquet.core.filter.internal.{ ColumnPathConcatMacro, SanitizeOptionalsMacro }
 
 package object syntax {
 
@@ -11,8 +11,7 @@ package object syntax {
       Column.Named(column.path)
   }
 
-  def predicate[A](predicate: Predicate[A]): CompiledPredicate = 
-    macro SanitizeOptionalsMacro.sanitizeImpl[A]
+  def predicate[A](predicate: Predicate[A]): CompiledPredicate = macro SanitizeOptionalsMacro.sanitizeImpl[A]
 
   def concat[A, B, F](
     parent: Column[A],

modules/core/src/main/scala-3/me/mnedokushev/zio/apache/parquet/core/filter/internal/SanitizeOptionalsMacro.scala

@@ -1,9 +1,9 @@
 package me.mnedokushev.zio.apache.parquet.core.filter.internal
 
-import me.mnedokushev.zio.apache.parquet.core.filter.Predicate
+import me.mnedokushev.zio.apache.parquet.core.filter.{ CompiledPredicate, Predicate }
 import org.apache.parquet.filter2.predicate.FilterPredicate
+
 import scala.quoted.*
-import me.mnedokushev.zio.apache.parquet.core.filter.CompiledPredicate
 
 object SanitizeOptionalsMacro {
 

modules/core/src/main/scala-3/me/mnedokushev/zio/apache/parquet/core/filter/syntax.scala

@@ -1,8 +1,7 @@
 package me.mnedokushev.zio.apache.parquet.core.filter
 
-import me.mnedokushev.zio.apache.parquet.core.filter.internal.ColumnPathConcatMacro
-import me.mnedokushev.zio.apache.parquet.core.filter.internal.SanitizeOptionalsMacro
 import me.mnedokushev.zio.apache.parquet.core.Lens
+import me.mnedokushev.zio.apache.parquet.core.filter.internal.{ ColumnPathConcatMacro, SanitizeOptionalsMacro }
 
 package object syntax {
 

modules/core/src/main/scala/me/mnedokushev/zio/apache/parquet/core/filter/Predicate.scala

@@ -1,8 +1,6 @@
 package me.mnedokushev.zio.apache.parquet.core.filter
 
-import org.apache.parquet.filter2.predicate.FilterPredicate
-import org.apache.parquet.filter2.predicate.Operators
-import org.apache.parquet.filter2.predicate.FilterApi
+import org.apache.parquet.filter2.predicate.{ FilterApi, FilterPredicate, Operators }
 import zio.prelude._
 
 sealed trait Predicate[A] { self =>

modules/core/src/main/scala/me/mnedokushev/zio/apache/parquet/core/hadoop/ParquetReader.scala

@@ -2,6 +2,7 @@ package me.mnedokushev.zio.apache.parquet.core.hadoop
 
 import me.mnedokushev.zio.apache.parquet.core.Value.GroupValue.RecordValue
 import me.mnedokushev.zio.apache.parquet.core.codec.{ SchemaEncoder, ValueDecoder }
+import me.mnedokushev.zio.apache.parquet.core.filter.CompiledPredicate
 import org.apache.hadoop.conf.Configuration
 import org.apache.parquet.filter2.compat.FilterCompat
 import org.apache.parquet.hadoop.api.{ ReadSupport => HadoopReadSupport }
@@ -12,7 +13,6 @@ import zio.schema.Schema
 import zio.stream._
 
 import java.io.IOException
-import me.mnedokushev.zio.apache.parquet.core.filter.CompiledPredicate
 
 trait ParquetReader[+A <: Product] {
 

modules/core/src/test/scala-2.13+/me/mnedokushev/zio/apache/parquet/core/Fixtures.scala

@@ -1,5 +1,14 @@
 package me.mnedokushev.zio.apache.parquet.core
 
+import me.mnedokushev.zio.apache.parquet.core.codec.{
+  SchemaEncoder,
+  SchemaEncoderDeriver,
+  ValueDecoder,
+  ValueDecoderDeriver,
+  ValueEncoder,
+  ValueEncoderDeriver
+}
+import me.mnedokushev.zio.apache.parquet.core.filter.{ TypeTag, TypeTagDeriver }
 import org.apache.parquet.filter2.predicate.FilterApi
 import org.apache.parquet.filter2.predicate.Operators.BinaryColumn
 import org.apache.parquet.io.api.Binary
@@ -8,14 +17,6 @@ import zio.schema._
 
 import java.time._
 import java.util.UUID
-import me.mnedokushev.zio.apache.parquet.core.codec.SchemaEncoder
-import me.mnedokushev.zio.apache.parquet.core.codec.ValueEncoder
-import me.mnedokushev.zio.apache.parquet.core.codec.SchemaEncoderDeriver
-import me.mnedokushev.zio.apache.parquet.core.codec.ValueDecoder
-import me.mnedokushev.zio.apache.parquet.core.codec.ValueEncoderDeriver
-import me.mnedokushev.zio.apache.parquet.core.codec.ValueDecoderDeriver
-import me.mnedokushev.zio.apache.parquet.core.filter.TypeTagDeriver
-import me.mnedokushev.zio.apache.parquet.core.filter.TypeTag
 
 object Fixtures {
 
@@ -101,7 +102,7 @@ object Fixtures {
   }
 
   case class MyProjectedRecordIO(a: Int, c: Option[Long], d: List[Int], e: Map[String, Int])
-  object MyProjectedRecordIO   {
+  object MyProjectedRecordIO {
     implicit val schema: zio.schema.Schema.CaseClass4.WithFields[
       "a",
       "c",
@@ -145,7 +146,7 @@ object Fixtures {
     zoneId: ZoneId,
     zoneOffset: ZoneOffset
   )
-  object MyRecordAllTypes1 {
+  object MyRecordAllTypes1   {
     implicit val schema: zio.schema.Schema.CaseClass21.WithFields[
       "string",
       "boolean",
@@ -205,7 +206,7 @@ object Fixtures {
     offsetDateTime: OffsetDateTime,
     zonedDateTime: ZonedDateTime
   )
-  object MyRecordAllTypes2 {
+  object MyRecordAllTypes2   {
     implicit val schema: zio.schema.Schema.CaseClass8.WithFields[
       "duration",
       "instant",

modules/core/src/test/scala/me/mnedokushev/zio/apache/parquet/core/filter/ExprSpec.scala

@@ -1,5 +1,6 @@
 package me.mnedokushev.zio.apache.parquet.core.filter
 
+import me.mnedokushev.zio.apache.parquet.core.Fixtures._
 import me.mnedokushev.zio.apache.parquet.core.Value
 import me.mnedokushev.zio.apache.parquet.core.filter.TypeTag._
 import me.mnedokushev.zio.apache.parquet.core.filter.syntax._
@@ -12,8 +13,6 @@ import java.time._
 import java.util.UUID
 import scala.jdk.CollectionConverters._
 
-import me.mnedokushev.zio.apache.parquet.core.Fixtures._
-
 object ExprSpec extends ZIOSpecDefault {
 
   override def spec: Spec[TestEnvironment & Scope, Any] =
@@ -292,34 +291,34 @@ object ExprSpec extends ZIOSpecDefault {
         val zonedDateTimeResult  = predicate(zonedDateTime === zonedDateTimePayload)
 
         assert(stringResul)(isRight(equalTo(stringExpected))) &&
-          assert(booleanResult)(isRight(equalTo(booleanExpected))) &&
-          assert(byteResult)(isRight(equalTo(byteExpected))) &&
-          assert(shortResult)(isRight(equalTo(shortExpected))) &&
-          assert(intResult)(isRight(equalTo(intExpected))) &&
-          assert(longResult)(isRight(equalTo(longExpected))) &&
-          assert(floatResult)(isRight(equalTo(floatExpected))) &&
-          assert(doubleResult)(isRight(equalTo(doubleExpected))) &&
-          assert(binaryResult)(isRight(equalTo(binaryExpected))) &&
-          assert(charResult)(isRight(equalTo(charExpected))) &&
-          assert(uuidResult)(isRight(equalTo(uuidExpected))) &&
-          assert(bigDecimalResult)(isRight(equalTo(bigDecimalExpected))) &&
-          assert(bigIntegerResult)(isRight(equalTo(bigIntegerExpected))) &&
-          assert(dayOfWeekResult)(isRight(equalTo(dayOfWeekExpected))) &&
-          assert(monthResult)(isRight(equalTo(monthExpected))) &&
-          assert(monthDayResult)(isRight(equalTo(monthDayExpected))) &&
-          assert(periodResult)(isRight(equalTo(periodExpected))) &&
-          assert(yearResult)(isRight(equalTo(yearExpected))) &&
-          assert(yearMonthResult)(isRight(equalTo(yearMonthExpected))) &&
-          assert(zoneIdResult)(isRight(equalTo(zoneIdExpected))) &&
-          assert(zoneOffsetResult)(isRight(equalTo(zoneOffsetExpected))) &&
-          assert(durationResult)(isRight(equalTo(durationExpected))) &&
-          assert(instantResult)(isRight(equalTo(instantExpected))) &&
-          assert(localDateResult)(isRight(equalTo(localDateExpected))) &&
-          assert(localTimeResult)(isRight(equalTo(localTimeExpected))) &&
-          assert(localDateTimeResult)(isRight(equalTo(localDateTimeExpected))) &&
-          assert(offsetTimeResult)(isRight(equalTo(offsetTimeExpected))) &&
-          assert(offsetDateTimeResult)(isRight(equalTo(offsetDateTimeExpected))) &&
-          assert(zonedDateTimeResult)(isRight(equalTo(zonedDateTimeExpected)))
+        assert(booleanResult)(isRight(equalTo(booleanExpected))) &&
+        assert(byteResult)(isRight(equalTo(byteExpected))) &&
+        assert(shortResult)(isRight(equalTo(shortExpected))) &&
+        assert(intResult)(isRight(equalTo(intExpected))) &&
+        assert(longResult)(isRight(equalTo(longExpected))) &&
+        assert(floatResult)(isRight(equalTo(floatExpected))) &&
+        assert(doubleResult)(isRight(equalTo(doubleExpected))) &&
+        assert(binaryResult)(isRight(equalTo(binaryExpected))) &&
+        assert(charResult)(isRight(equalTo(charExpected))) &&
+        assert(uuidResult)(isRight(equalTo(uuidExpected))) &&
+        assert(bigDecimalResult)(isRight(equalTo(bigDecimalExpected))) &&
+        assert(bigIntegerResult)(isRight(equalTo(bigIntegerExpected))) &&
+        assert(dayOfWeekResult)(isRight(equalTo(dayOfWeekExpected))) &&
+        assert(monthResult)(isRight(equalTo(monthExpected))) &&
+        assert(monthDayResult)(isRight(equalTo(monthDayExpected))) &&
+        assert(periodResult)(isRight(equalTo(periodExpected))) &&
+        assert(yearResult)(isRight(equalTo(yearExpected))) &&
+        assert(yearMonthResult)(isRight(equalTo(yearMonthExpected))) &&
+        assert(zoneIdResult)(isRight(equalTo(zoneIdExpected))) &&
+        assert(zoneOffsetResult)(isRight(equalTo(zoneOffsetExpected))) &&
+        assert(durationResult)(isRight(equalTo(durationExpected))) &&
+        assert(instantResult)(isRight(equalTo(instantExpected))) &&
+        assert(localDateResult)(isRight(equalTo(localDateExpected))) &&
+        assert(localTimeResult)(isRight(equalTo(localTimeExpected))) &&
+        assert(localDateTimeResult)(isRight(equalTo(localDateTimeExpected))) &&
+        assert(offsetTimeResult)(isRight(equalTo(offsetTimeExpected))) &&
+        assert(offsetDateTimeResult)(isRight(equalTo(offsetDateTimeExpected))) &&
+        assert(zonedDateTimeResult)(isRight(equalTo(zonedDateTimeExpected)))
       },
       test("compile option") {
         // TODO: test failing compile-time cases

modules/core/src/test/scala/me/mnedokushev/zio/apache/parquet/core/hadoop/ParquetIOSpec.scala

@@ -1,14 +1,14 @@
 package me.mnedokushev.zio.apache.parquet.core.hadoop
 
+import me.mnedokushev.zio.apache.parquet.core.Fixtures._
+import me.mnedokushev.zio.apache.parquet.core.filter._
+import me.mnedokushev.zio.apache.parquet.core.filter.syntax._
 import zio._
 import zio.stream._
 import zio.test.TestAspect._
 import zio.test._
 
 import java.nio.file.Files
-import me.mnedokushev.zio.apache.parquet.core.filter._
-import me.mnedokushev.zio.apache.parquet.core.filter.syntax._
-import me.mnedokushev.zio.apache.parquet.core.Fixtures._
 
 object ParquetIOSpec extends ZIOSpecDefault {
 

project/BuildHelper.scala

@@ -41,8 +41,6 @@ object BuildHelper {
 
   def crossVersionSources(scalaVersion: String, conf: String, baseDirectory: File): List[File] = {
     val versions = CrossVersion.partialVersion(scalaVersion) match {
-      case Some((2, 12)) =>
-        List("2", "2.12")
       case Some((2, 13)) =>
         List("2", "2.13", "2.13+")
       case Some((3, _))  =>