Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading