Merge pull request #560 from hughsimpson/scala3-v2

bump deps and fix java annotations

build.sbt

@@ -2,7 +2,7 @@ import com.softwaremill.UpdateVersionInDocs
 import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
 import com.softwaremill.Publish.{updateDocs, ossPublishSettings}
 
-val scala3 = "3.2.1"
+val scala3 = "3.3.4"
 
 ThisBuild / dynverTagPrefix := "scala3-v" // a custom prefix is needed to differentiate tags between scala2 & scala3 versions
 
@@ -75,7 +75,7 @@ lazy val test = (projectMatrix in file(".test"))
     name := "magnolia-test",
     scalacOptions += "-Yretain-trees",
     projectDependencies ++= Seq(
-      "org.scalameta" %%% "munit" % "1.0.0-M6"
+      "org.scalameta" %%% "munit" % "1.0.0-M12"
     ),
     testFrameworks += new TestFramework("munit.Framework"),
     Test / scalaSource := baseDirectory.value / ".." / ".." / ".." / "src" / "test",

project/build.properties

@@ -1 +1 @@
-sbt.version=1.8.0
+sbt.version=1.10.1

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.0")
+addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")
 
 val sbtSoftwareMillVersion = "2.0.12"
 addSbtPlugin(
@@ -8,6 +8,6 @@ addSbtPlugin(
   "com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion
 )
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9")
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")

src/core/impl.scala

@@ -1,5 +1,6 @@
 package magnolia2
 
+import scala.annotation.Annotation
 import scala.compiletime.*
 import scala.deriving.Mirror
 import scala.reflect.*
@@ -85,7 +86,7 @@ object CaseClassDerivation:
       parameters,
       IArray(anns[A]*),
       IArray(inheritedAnns[A]*),
-      IArray[Any](typeAnns[A]*)
+      IArray[Annotation](typeAnns[A]*)
     ):
       def construct[PType: ClassTag](makeParam: Param => PType): A =
         product.fromProduct(Tuple.fromArray(params.map(makeParam).to(Array)))
@@ -120,9 +121,9 @@ object CaseClassDerivation:
       }
 
   inline def paramsFromMaps[Typeclass[_], A, Labels <: Tuple, Params <: Tuple](
-      annotations: Map[String, List[Any]],
-      inheritedAnnotations: Map[String, List[Any]],
-      typeAnnotations: Map[String, List[Any]],
+      annotations: Map[String, List[Annotation]],
+      inheritedAnnotations: Map[String, List[Annotation]],
+      typeAnnotations: Map[String, List[Annotation]],
       repeated: Map[String, Boolean],
       defaults: Map[String, Option[() => Any]],
       idx: Int = 0
@@ -165,7 +166,7 @@ trait SealedTraitDerivation:
       typeInfo[A],
       IArray(subtypesFromMirror[A, m.MirroredElemTypes](m)*),
       IArray.from(anns[A]),
-      IArray(paramTypeAnns[A]*),
+      IArray.from(paramTypeAnns[A]),
       isEnum[A],
       IArray.from(inheritedAnns[A])
     )

src/core/interface.scala

@@ -1,6 +1,6 @@
 package magnolia2
 
-import scala.annotation.tailrec
+import scala.annotation.{Annotation, tailrec}
 import scala.reflect.*
 
 case class TypeInfo(
@@ -15,8 +15,8 @@ object CaseClass:
       val label: String,
       val index: Int,
       val repeated: Boolean,
-      val annotations: IArray[Any],
-      val typeAnnotations: IArray[Any]
+      val annotations: IArray[Annotation],
+      val typeAnnotations: IArray[Annotation]
   ) extends Serializable:
 
     type PType
@@ -42,7 +42,7 @@ object CaseClass:
       *   default argument value, if any
       */
     def default: Option[PType]
-    def inheritedAnnotations: IArray[Any] = IArray.empty[Any]
+    def inheritedAnnotations: IArray[Annotation] = IArray.empty[Annotation]
     override def toString: String = s"Param($label)"
 
   object Param:
@@ -53,9 +53,9 @@ object CaseClass:
         repeated: Boolean,
         cbn: CallByNeed[F[P]],
         defaultVal: CallByNeed[Option[P]],
-        annotations: IArray[Any],
-        inheritedAnns: IArray[Any],
-        typeAnnotations: IArray[Any]
+        annotations: IArray[Annotation],
+        inheritedAnns: IArray[Annotation],
+        typeAnnotations: IArray[Annotation]
     ): Param[F, T] =
       new CaseClass.Param[F, T](
         name,
@@ -89,9 +89,9 @@ abstract class CaseClass[Typeclass[_], Type](
     val isObject: Boolean,
     val isValueClass: Boolean,
     val params: IArray[CaseClass.Param[Typeclass, Type]],
-    val annotations: IArray[Any],
-    val inheritedAnnotations: IArray[Any] = IArray.empty[Any],
-    val typeAnnotations: IArray[Any]
+    val annotations: IArray[Annotation],
+    val inheritedAnnotations: IArray[Annotation] = IArray.empty[Annotation],
+    val typeAnnotations: IArray[Annotation]
 ) extends Serializable:
 
   type Param = CaseClass.Param[Typeclass, Type]
@@ -113,9 +113,9 @@ abstract class CaseClass[Typeclass[_], Type](
       repeated: Boolean,
       cbn: CallByNeed[Typeclass[P]],
       defaultVal: CallByNeed[Option[P]],
-      annotations: IArray[Any],
-      inheritedAnns: IArray[Any],
-      typeAnnotations: IArray[Any]
+      annotations: IArray[Annotation],
+      inheritedAnns: IArray[Annotation],
+      typeAnnotations: IArray[Annotation]
   ): Param =
     new CaseClass.Param[Typeclass, Type](
       name,
@@ -141,10 +141,10 @@ end CaseClass
 case class SealedTrait[Typeclass[_], Type](
     typeInfo: TypeInfo,
     subtypes: IArray[SealedTrait.Subtype[Typeclass, Type, _]],
-    annotations: IArray[Any],
-    typeAnnotations: IArray[Any],
+    annotations: IArray[Annotation],
+    typeAnnotations: IArray[(String, List[Annotation])],
     isEnum: Boolean,
-    inheritedAnnotations: IArray[Any]
+    inheritedAnnotations: IArray[Annotation]
 ) extends Serializable:
 
   type Subtype[S] = SealedTrait.SubtypeValue[Typeclass, Type, S]
@@ -191,9 +191,9 @@ object SealedTrait:
     */
   class Subtype[Typeclass[_], Type, SType](
       val typeInfo: TypeInfo,
-      val annotations: IArray[Any],
-      val inheritedAnnotations: IArray[Any],
-      val typeAnnotations: IArray[Any],
+      val annotations: IArray[Annotation],
+      val inheritedAnnotations: IArray[Annotation],
+      val typeAnnotations: IArray[(String, List[Annotation])],
       val isObject: Boolean,
       callByNeed: CallByNeed[Typeclass[SType]],
       isType: Type => Boolean,