Merge pull request #608 from xuwei-k/ClassTag-Manifest

use `ClassTag` instead of `Manifest`
eed3si9n · Oct 4, 2023 · 55af826 · 55af826
2 parents eadcf3e + 87fd9d5
commit 55af826
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cli/src/main/resources/visitor.scala.template b/cli/src/main/resources/visitor.scala.template
@@ -1,6 +1,6 @@
 package scalaxb
 
-import scala.reflect.Manifest
+import scala.reflect.ClassTag
 
 /**
  * Visitor utility for ScalaXB structures.
@@ -68,7 +68,7 @@ trait VisitorTrait {
   /**
    * Collects all the nodes of a given class.
    */
-  def collect[T](implicit m: Manifest[T]): Seq[T] =
+  def collect[T](implicit m: ClassTag[T]): Seq[T] =
     collect(m.runtimeClass.isInstance(_)).asInstanceOf[Seq[T]]
 
 

diff --git a/cli/src/main/scala/scalaxb/compiler/Config.scala b/cli/src/main/scala/scalaxb/compiler/Config.scala
@@ -24,6 +24,7 @@ package scalaxb.compiler
 
 import java.io.File
 import scala.collection.immutable.{ Map, Set, Seq }
+import scala.reflect.ClassTag
 
 case class Config(items: Map[String, ConfigEntry]) {
   import Config._
@@ -88,8 +89,8 @@ case class Config(items: Map[String, ConfigEntry]) {
   def useLists: Boolean = values contains UseLists
   def jaxbPackage = get[JaxbPackage] getOrElse defaultJaxbPackage
 
-  private def get[A <: ConfigEntry: Manifest]: Option[A] =
-    items.get(implicitly[Manifest[A]].runtimeClass.getName).asInstanceOf[Option[A]]
+  private def get[A <: ConfigEntry: ClassTag]: Option[A] =
+    items.get(implicitly[ClassTag[A]].runtimeClass.getName).asInstanceOf[Option[A]]
   def update(item: ConfigEntry): Config =
     copy(items = items.updated(item.name, item))
   def remove(item: ConfigEntry): Config =