Skip to content

Commit 4e0aed8

Browse files
Merge commit 'a20f71001'
Conflicts: .github/workflows/ci.yml build.sbt docs-gen/src/main/scala/bloop/Docs.scala docs-gen/src/main/scala/bloop/docs/Sonatype.scala docs/build-tools/gradle.md docs/contributing-guide.md project/BuildPlugin.scala project/Dependencies.scala
2 parents 98af270 + a20f710 commit 4e0aed8

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

project/BuildPlugin.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import sbt.io.syntax.fileToRichFile
1919
import sbt.librarymanagement.syntax.stringToOrganization
2020
import sbt.util.FileFunction
2121
import sbtdynver.GitDescribeOutput
22+
import sbtbuildinfo.BuildInfoPlugin.{autoImport => BuildInfoKeys}
2223

2324
object BuildPlugin extends AutoPlugin {
2425
import sbt.plugins.JvmPlugin
@@ -156,8 +157,6 @@ object BuildImplementation {
156157

157158
object BuildDefaults {
158159

159-
import sbtbuildinfo.BuildInfoPlugin.{autoImport => BuildInfoKeys}
160-
161160
val frontendTestBuildSettings: Seq[Def.Setting[_]] = {
162161
sbtbuildinfo.BuildInfoPlugin.buildInfoScopedSettings(Test) ++ List(
163162
(Test / BuildInfoKeys.buildInfoKeys) := {

0 commit comments

Comments
 (0)