diff --git a/build.sbt b/build.sbt index be8a1442c..2959d6a27 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,12 @@ name := "codepropertygraph" // parsed by project/Versions.scala, updated by updateDependencies.sh -val flatgraphVersion = "0.1.29" +val flatgraphVersion = "0.1.31" inThisBuild( List( organization := "io.shiftleft", - scalaVersion := "3.6.4", + scalaVersion := "3.7.4", resolvers ++= Seq(Resolver.mavenLocal, "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public"), packageDoc / publishArtifact := true, packageSrc / publishArtifact := true, @@ -62,8 +62,8 @@ ThisBuild / scalacOptions ++= Seq( // "-explain", // "-Xfatal-warnings", // "-Wconf:cat=deprecation:w,any:e", + "-Wconf:msg=Implicit parameters should be provided with a `using` clause:s", "-language:implicitConversions", - "-old-syntax", "-no-indent" ) diff --git a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ZipArchive.scala b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ZipArchive.scala index 37a3f801b..27cf7e2d9 100644 --- a/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ZipArchive.scala +++ b/codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ZipArchive.scala @@ -14,7 +14,7 @@ class ZipArchive(inputFile: String) extends Closeable { private def root: Path = zipFileSystem.getRootDirectories.iterator.next private def walk(rootPath: Path): Seq[Path] = { - val entries = ArraySeq.newBuilder[Path]() + val entries = ArraySeq.newBuilder[Path] Files.walkFileTree( rootPath, new SimpleFileVisitor[Path]() { diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala index 94a5f3a8b..219b65ff6 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala @@ -8,18 +8,18 @@ object Cpg { val defaultDocSearchPackage = DocSearchPackages.default.withAdditionalPackage(getClass.getPackage.getName) @scala.annotation.implicitNotFound("""If you're using flatgraph purely without a schema and associated generated domain classes, you can - |start with `given DocSearchPackages = DocSearchPackages.default`. - |If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`. - |If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"` - |""".stripMargin) +start with `given DocSearchPackages = DocSearchPackages.default`. +If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`. +If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"` +""") def help(implicit searchPackageNames: DocSearchPackages, availableWidthProvider: AvailableWidthProvider) = flatgraph.help.TraversalHelp(searchPackageNames).forTraversalSources(verbose = false) @scala.annotation.implicitNotFound("""If you're using flatgraph purely without a schema and associated generated domain classes, you can - |start with `given DocSearchPackages = DocSearchPackages.default`. - |If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`. - |If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"` - |""".stripMargin) +start with `given DocSearchPackages = DocSearchPackages.default`. +If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`. +If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"` +""") def helpVerbose(implicit searchPackageNames: DocSearchPackages, availableWidthProvider: AvailableWidthProvider) = flatgraph.help.TraversalHelp(searchPackageNames).forTraversalSources(verbose = true)