Merge pull request #492 from AVSystem/scala-steward-update/scala-compiler-2.13.12

Scala 2.13.12

Author: sebaciv

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.11]
+        scala: [2.13.12]
         java: [temurin@11, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
@@ -82,7 +82,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.11]
+        scala: [2.13.12]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:

core/src/main/scala/com/avsystem/commons/meta/metaAnnotations.scala

@@ -278,13 +278,6 @@ final class isAnnotated[T <: StaticAnnotation] extends DirectMetadataParamStrate
   */
 final class reifyName(val useRawName: Boolean = false) extends DirectMetadataParamStrategy
 
-/**
-  * Metadata parameter annotated with this annotation must be of type `SymbolSource` -
-  * class that holds symbol source information - start & end offsets of symbol definition as well as actual
-  * source text.
-  */
-final class reifySource extends DirectMetadataParamStrategy
-
 /**
   * Metadata parameter annotated with this annotation must be of type `ParamPosition` or `MethodPosition` -
   * a class that holds parameter/method index information - see scaladoc for `ParamPosition` & `MethodPosition`

core/src/test/scala/com/avsystem/commons/misc/SharedExtensionsTest.scala

@@ -154,7 +154,7 @@ class SharedExtensionsTest extends AnyFunSuite with Matchers {
   }
 
   test("sourceCode") {
-    // for some magical reason does not work on 'Int' type in Scala 2.13.11:
+    // for some magical reason does not work on 'Int' type in Scala 2.13.12:
     // java.lang.NullPointerException: Cannot invoke "scala.reflect.internal.Symbols$Symbol.owner()" because the return value of "scala.reflect.internal.Trees$Tree.symbol()" is null
     // scala.tools.nsc.typechecker.Typers$Typer.checkDubiousAdaptation$1(Typers.scala:5330)
     // assert(123.sourceCode == "123")

core/src/test/scala/com/avsystem/commons/rpc/SymbolSourceTest.scala

@@ -108,18 +108,6 @@ object CodecTestData {
     override def hashCode(): Int = args.hashCode()
   }
 
-  trait Framework {
-    type Field
-
-    case class Stuff(field: Field)
-  }
-
-  trait BetterFramework extends Framework {
-    implicit def fieldCodec: GenCodec[Field]
-
-    implicit val stuffCodec: GenCodec[Stuff] = GenCodec.materialize
-  }
-
   object SomeObject {
     @generated def random: Int = 42
     implicit val codec: GenCodec[SomeObject.type] = GenCodec.materialize[SomeObject.type]

core/src/test/scala/com/avsystem/commons/serialization/CodecTestData.scala

@@ -17,7 +17,6 @@ private[commons] trait MacroMetadatas extends MacroSymbols {
   final lazy val ReifyAnnotAT: Type = staticType(tq"$MetaPackage.reifyAnnot")
   final lazy val IsAnnotatedAT: Type = staticType(tq"$MetaPackage.isAnnotated[_]")
   final lazy val ReifyNameAT: Type = staticType(tq"$MetaPackage.reifyName")
-  final lazy val ReifySourceAT: Type = staticType(tq"$MetaPackage.reifySource")
   final lazy val ReifyPositionAT: Type = staticType(tq"$MetaPackage.reifyPosition")
   final lazy val ReifyParamListCountAT: Type = staticType(tq"$MetaPackage.reifyParamListCount")
   final lazy val ReifyFlagsAT: Type = staticType(tq"$MetaPackage.reifyFlags")
@@ -157,15 +156,15 @@ private[commons] trait MacroMetadatas extends MacroSymbols {
         case t if t <:< InferAT =>
           val clue = annot.findArg[String](InferAT.member(TermName("clue")), "")
           new ImplicitParam(ownerConstr, paramSym, clue)
-        case t if t <:< ReifyAnnotAT => new ReifiedAnnotParam(ownerConstr, paramSym)
+        case t if t <:< ReifyAnnotAT =>
+          new ReifiedAnnotParam(ownerConstr, paramSym)
         case t if t <:< ReifyNameAT =>
           val useRawName = annot.findArg[Boolean](ReifyNameAT.member(TermName("useRawName")), false)
           new ReifiedNameParam(ownerConstr, paramSym, useRawName)
-        case t if t <:< ReifySourceAT =>
-          new ReifiedSourceParam(ownerConstr, paramSym)
         case t if t <:< IsAnnotatedAT =>
           new IsAnnotatedParam(ownerConstr, paramSym, t.typeArgs.head)
-        case t => reportProblem(s"metadata param strategy $t is not allowed here")
+        case t =>
+          reportProblem(s"metadata param strategy $t is not allowed here")
       }
 
     def compositeConstructor(param: CompositeParam): MetadataConstructor
@@ -344,36 +343,6 @@ private[commons] trait MacroMetadatas extends MacroSymbols {
       Ok(q"${if (useRawName) matchedSymbol.rawName else matchedSymbol.real.nameStr}")
   }
 
-  class ReifiedSourceParam(owner: MetadataConstructor, symbol: Symbol)
-    extends DirectMetadataParam(owner, symbol) {
-
-    if (!(actualType =:= SymbolSourceTpe)) {
-      reportProblem(s"its type is not SymbolSource")
-    }
-
-    def tryMaterializeFor(matchedSymbol: MatchedSymbol): Res[Tree] = {
-      val sym = matchedSymbol.real.symbol
-      sym.pos match {
-        case NoPosition =>
-          FailMsg(s"source information not available for ${matchedSymbol.real.description}")
-        case pos => Ok {
-          val source = pos.source
-          val startPos = pos.withPoint(pos.start)
-          val endPos = pos.withPoint(pos.end)
-          q"""
-            $MetaPackage.SymbolSource(
-              ${source.path},
-              ${source.file.name},
-              $MetaPackage.SourceOffset(${startPos.point}, ${startPos.line}, ${startPos.column}),
-              $MetaPackage.SourceOffset(${endPos.point}, ${endPos.line}, ${endPos.column}),
-              ${new String(source.content, pos.start, pos.end - pos.start)}
-            )
-           """
-        }
-      }
-    }
-  }
-
   class ParamPositionParam(owner: MetadataConstructor, symbol: Symbol)
     extends DirectMetadataParam(owner, symbol) {
 

macros/src/main/scala/com/avsystem/commons/macros/meta/MacroMetadatas.scala

@@ -40,7 +40,7 @@ object Commons extends ProjectGroup("commons") {
   val circeVersion = "0.14.5" // benchmark only
   val upickleVersion = "3.1.2" // benchmark only
   val scalajsBenchmarkVersion = "0.10.0"
-  val slf4jVersion = "2.0.9"
+  val slf4jVersion = "2.0.9" // test only
 
   // for binary compatibility checking
   val previousCompatibleVersions: Set[String] = Set("2.2.4")
@@ -69,7 +69,7 @@ object Commons extends ProjectGroup("commons") {
       Developer("ghik", "Roman Janusz", "[email protected]", url("https://github.com/ghik")),
     ),
 
-    scalaVersion := "2.13.11",
+    scalaVersion := "2.13.12",
     compileOrder := CompileOrder.Mixed,
 
     githubWorkflowTargetTags ++= Seq("v*"),