From 32a3f54eab11686bf260a55cad2c746bcf5ae2f6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 29 Feb 2024 18:25:13 +0000 Subject: [PATCH 1/2] Update scala-compiler, scala-library to 2.13.13 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8686b42..61eb7c8 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ licenses := Seq( homepage := Some(url("http://github.com/lightbend/scala-sculpt")) scalaVersion := crossScalaVersions.value.head -crossScalaVersions := Seq("2.13.12", "2.12.18") +crossScalaVersions := Seq("2.13.13", "2.12.18") libraryDependencies ++= Seq( "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided", From 53d36f8494147f5496fa520c4afc8e95e34a5c62 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 14 Mar 2024 16:01:54 +0100 Subject: [PATCH 2/2] avoid new lint in Scala 2.13.13 --- .../lightbend/tools/sculpt/plugin/ExtractDependencies.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/com/lightbend/tools/sculpt/plugin/ExtractDependencies.scala b/src/main/scala/com/lightbend/tools/sculpt/plugin/ExtractDependencies.scala index 1944357..448cfb5 100644 --- a/src/main/scala/com/lightbend/tools/sculpt/plugin/ExtractDependencies.scala +++ b/src/main/scala/com/lightbend/tools/sculpt/plugin/ExtractDependencies.scala @@ -113,7 +113,8 @@ abstract class ExtractDependencies extends PluginComponent { // skip packages private def symbolsInType(tp: Type) = tp.collect { - case tp if tp != null && !(tp.typeSymbolDirect hasFlag PACKAGE) => tp.typeSymbolDirect + case part if part != null && !part.typeSymbolDirect.hasFlag(PACKAGE) => + part.typeSymbolDirect }.toSet private def flattenTypeToSymbols(tp: Type): List[Symbol] = if (tp eq null) Nil