diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 020c3290..9eca4b16 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.7.3 0025d5c30e455eca8a1ffbf8304e69214f328cab + +# Scala Steward: Reformat with scalafmt 3.8.0 +00d482c75c16b0791a717e6374de4adf225f8af1 diff --git a/.scalafmt.conf b/.scalafmt.conf index 762f0152..99ff0a80 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=3.7.17 +version=3.8.0 style = defaultWithAlign maxColumn = 100 assumeStandardLibraryStripMargin = true diff --git a/src/main/scala/sbtprotoc/ProtocPlugin.scala b/src/main/scala/sbtprotoc/ProtocPlugin.scala index 77f942ca..8ae10cf3 100644 --- a/src/main/scala/sbtprotoc/ProtocPlugin.scala +++ b/src/main/scala/sbtprotoc/ProtocPlugin.scala @@ -315,7 +315,7 @@ object ProtocPlugin extends AutoPlugin { PB.includePaths.?.value.getOrElse(Nil) ++ PB.protoSources.value ++ Seq(PB.externalIncludePath.value, PB.externalSourcePath.value) ++ - protocIncludeDependencies.value, + protocIncludeDependencies.value ).distinct, PB.generate := sourceGeneratorTask(PB.generate) .dependsOn(