Skip to content

Commit e2542f3

Browse files
Update scalafmt-core to 3.7.4 (#2803)
* Update scalafmt-core to 3.7.4 * Reformat with scalafmt 3.7.4 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.7.4' to .git-blame-ignore-revs
1 parent be1e55f commit e2542f3

File tree

6 files changed

+8
-12
lines changed

6 files changed

+8
-12
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ bf250ee518938384494e1cfe3627097d78b8096f
99

1010
# Scala Steward: Reformat with scalafmt 3.7.3
1111
9b86120d9611590c50f59280e3cde34b796f3562
12+
13+
# Scala Steward: Reformat with scalafmt 3.7.4
14+
aadcc712252a43c635ef2ca9e61cdc982e7c2b94

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.7.3
1+
version = 3.7.4
22
runner.dialect = scala213
33
preset = IntelliJ
44
maxColumn = 120

joern-cli/build.sbt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
name := "joern-cli"
22

3-
dependsOn(
4-
Projects.console,
5-
Projects.console % "test->test",
6-
Projects.dataflowengineoss,
7-
Projects.x2cpg
8-
)
3+
dependsOn(Projects.console, Projects.console % "test->test", Projects.dataflowengineoss, Projects.x2cpg)
94

105
libraryDependencies ++= Seq(
116
"io.shiftleft" %% "codepropertygraph" % Versions.cpg,

joern-cli/frontends/php2cpg/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ scalacOptions ++= Seq(
2525

2626
lazy val phpParseInstallTask = taskKey[Unit]("Install PHP-Parse using PHP Composer")
2727
phpParseInstallTask := {
28-
val phpBinDir = baseDirectory.value / "bin"
28+
val phpBinDir = baseDirectory.value / "bin"
2929
if (!(phpBinDir / phpParserBinName).exists) {
3030
IO.createDirectory(phpBinDir)
3131
val downloadedFile = SimpleCache.downloadMaybe(phpParserDlUrl)

joern-cli/frontends/pysrc2cpg/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ val javaCCTask = taskKey[Seq[File]]("Generate compiler code with JavaCC")
1919
javaCCTask / fileInputs += baseDirectory.value.toGlob / "pythonGrammar.jj"
2020
javaCCTask := {
2121
import org.javacc.parser.{Main => JavaCCMain}
22-
val outputDir = (Compile / sourceManaged).value / "io" / "joern" / "pythonparser"
22+
val outputDir = (Compile / sourceManaged).value / "io" / "joern" / "pythonparser"
2323
val inputFileOption = javaCCTask.inputFiles.head
2424
if (
2525
!outputDir.exists() ||

querydb/build.sbt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ dependsOn(
1212
Projects.kotlin2cpg % "test->test"
1313
)
1414

15-
libraryDependencies ++= Seq(
16-
"org.scalatest" %% "scalatest" % Versions.scalatest % Test
17-
)
15+
libraryDependencies ++= Seq("org.scalatest" %% "scalatest" % Versions.scalatest % Test)
1816

1917
topLevelDirectory := Some(name.value)
2018

0 commit comments

Comments
 (0)