Skip to content

Commit ab32551

Browse files
authored
Bump to Scala 3.7. and update flatgraphVersion. (#1850)
1 parent 1d794da commit ab32551

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

  • codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading
  • domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name := "codepropertygraph"
22

33
// parsed by project/Versions.scala, updated by updateDependencies.sh
4-
val flatgraphVersion = "0.1.29"
4+
val flatgraphVersion = "0.1.31"
55

66
inThisBuild(
77
List(
88
organization := "io.shiftleft",
9-
scalaVersion := "3.6.4",
9+
scalaVersion := "3.7.4",
1010
resolvers ++= Seq(Resolver.mavenLocal, "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public"),
1111
packageDoc / publishArtifact := true,
1212
packageSrc / publishArtifact := true,
@@ -62,8 +62,8 @@ ThisBuild / scalacOptions ++= Seq(
6262
// "-explain",
6363
// "-Xfatal-warnings",
6464
// "-Wconf:cat=deprecation:w,any:e",
65+
"-Wconf:msg=Implicit parameters should be provided with a `using` clause:s",
6566
"-language:implicitConversions",
66-
"-old-syntax",
6767
"-no-indent"
6868
)
6969

codepropertygraph/src/main/scala/io/shiftleft/codepropertygraph/cpgloading/ZipArchive.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ZipArchive(inputFile: String) extends Closeable {
1414
private def root: Path = zipFileSystem.getRootDirectories.iterator.next
1515

1616
private def walk(rootPath: Path): Seq[Path] = {
17-
val entries = ArraySeq.newBuilder[Path]()
17+
val entries = ArraySeq.newBuilder[Path]
1818
Files.walkFileTree(
1919
rootPath,
2020
new SimpleFileVisitor[Path]() {

domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ object Cpg {
88
val defaultDocSearchPackage = DocSearchPackages.default.withAdditionalPackage(getClass.getPackage.getName)
99

1010
@scala.annotation.implicitNotFound("""If you're using flatgraph purely without a schema and associated generated domain classes, you can
11-
|start with `given DocSearchPackages = DocSearchPackages.default`.
12-
|If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`.
13-
|If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"`
14-
|""".stripMargin)
11+
start with `given DocSearchPackages = DocSearchPackages.default`.
12+
If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`.
13+
If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"`
14+
""")
1515
def help(implicit searchPackageNames: DocSearchPackages, availableWidthProvider: AvailableWidthProvider) =
1616
flatgraph.help.TraversalHelp(searchPackageNames).forTraversalSources(verbose = false)
1717

1818
@scala.annotation.implicitNotFound("""If you're using flatgraph purely without a schema and associated generated domain classes, you can
19-
|start with `given DocSearchPackages = DocSearchPackages.default`.
20-
|If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`.
21-
|If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"`
22-
|""".stripMargin)
19+
start with `given DocSearchPackages = DocSearchPackages.default`.
20+
If you have generated domain classes, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage`.
21+
If you have additional custom extension steps that specify help texts via @Doc annotations, use `given DocSearchPackages = MyDomain.defaultDocSearchPackage.withAdditionalPackage("my.custom.package)"`
22+
""")
2323
def helpVerbose(implicit searchPackageNames: DocSearchPackages, availableWidthProvider: AvailableWidthProvider) =
2424
flatgraph.help.TraversalHelp(searchPackageNames).forTraversalSources(verbose = true)
2525

0 commit comments

Comments
 (0)