airframe-surface: Use the fixed declaredTypes in Scala 3.3.0 scala/scala3#15033

Author: xerial

airframe-metrics/src/main/scala/wvlet/airframe/metrics/Count.scala

@@ -66,8 +66,6 @@ case class Count(value: Long, unit: CountUnit) extends Comparable[Count] {
   }
 }
 
-/**
-  */
 object Count {
   Zero.register(Surface.of[CountUnit], ONE)
   Zero.register(Surface.of[Count], Count(0))

airframe-surface/src/main/scala-3/wvlet/airframe/surface/CompileTimeSurfaceFactory.scala

@@ -13,7 +13,7 @@ private[surface] object CompileTimeSurfaceFactory {
     val surfaceExpr = f.surfaceOf(tpe)
     val t           = TypeRepr.of[A]
     val flags       = t.typeSymbol.flags
-    if (!flags.is(Flags.Static) && flags.is(Flags.NoInits)) {
+    if (!flags.is(Flags.JavaStatic) && flags.is(Flags.NoInits)) {
       t.typeSymbol.maybeOwner match {
         // For inner-class definitions
         case s: Symbol
@@ -397,7 +397,7 @@ private[surface] class CompileTimeSurfaceFactory[Q <: Quotes](using quotes: Q) {
   }
 
   private def isPathDependentType(t: TypeRepr): Boolean = {
-    !t.typeSymbol.flags.is(Flags.Static) && (t match {
+    !t.typeSymbol.flags.is(Flags.JavaStatic) && (t match {
       case t: TypeBounds => true
       case _             => false
     })
@@ -500,9 +500,10 @@ private[surface] class CompileTimeSurfaceFactory[Q <: Quotes](using quotes: Q) {
     val typeArgTable: Map[String, TypeRepr] = typeMappingTable(t, method)
 
     val origParamSymss = method.paramSymss
-    val typeMembers    = t.typeSymbol.typeMembers.filterNot(_.flags.is(Flags.Module))
+
+    val declaredTypes = t.typeSymbol.declaredTypes.filterNot(_.flags.is(Flags.Module))
     val paramss = {
-      if (origParamSymss.nonEmpty && typeMembers.nonEmpty)
+      if (origParamSymss.nonEmpty && declaredTypes.nonEmpty)
         origParamSymss.tail
       else {
         origParamSymss
@@ -816,7 +817,7 @@ private[surface] class CompileTimeSurfaceFactory[Q <: Quotes](using quotes: Q) {
     if (m.flags.is(Flags.Protected)) {
       mod |= MethodModifier.PROTECTED
     }
-    if (m.flags.is(Flags.Static)) {
+    if (m.flags.is(Flags.JavaStatic)) {
       mod |= MethodModifier.STATIC
     }
     if (m.flags.is(Flags.Final)) {

build.sbt

@@ -828,7 +828,7 @@ lazy val benchmark =
         // For grpc-java
         "io.grpc"             % "grpc-protobuf" % GRPC_VERSION,
         "com.google.protobuf" % "protobuf-java" % "3.23.1",
-        "com.chatwork"       %% "scala-ulid"    % "1.0.24"
+        ("com.chatwork"      %% "scala-ulid"    % "1.0.24").cross(CrossVersion.for3Use2_13)
       )
       //      Compile / PB.targets := Seq(
       //        scalapb.gen() -> (sourceManaged in Compile).value / "scalapb"