Skip to content

use consistent line endings on all platforms #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

use consistent line endings on all platforms #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/scala/com/github/sbt/sbom/BomTask.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ abstract class BomTask[T](protected val properties: BomTaskProperties) {
val params: BomExtractorParams = extractorParams(currentConfiguration)
val bom: Bom = new BomExtractor(params, report, log).bom
val bomText: String = bomFormat match {
case BomFormat.Json => BomGeneratorFactory.createJson(schemaVersion, bom).toJsonString
case BomFormat.Xml => BomGeneratorFactory.createXml(schemaVersion, bom).toXmlString
case BomFormat.Json => BomGeneratorFactory.createJson(schemaVersion, bom).toJsonString.replaceAll("\r?\n", "\n")
case BomFormat.Xml => BomGeneratorFactory.createXml(schemaVersion, bom).toXmlString.replaceAll("\r?\n", "\n")
}
logBomInfo(params, bom)
bomText
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/dependencies/compile/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ lazy val checkTask = Def.task {
s.log.info("Verifying bom content...")
makeBom.value
import scala.sys.process._
require(Seq("diff", "-w", "target/bom.xml", s"${thisProject.value.base}/etc/bom.xml").! == 0)
require(Seq("diff", "target/bom.xml", s"${thisProject.value.base}/etc/bom.xml").! == 0)
}
2 changes: 1 addition & 1 deletion src/sbt-test/dependencies/integrationTest/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ lazy val checkTask = Def.task {
val bomFile = (IntegrationTest / makeBom).value

import scala.sys.process._
require(Seq("diff", "-w", bomFile.getPath, s"${thisProject.value.base}/etc/bom.xml").! == 0)
require(Seq("diff", bomFile.getPath, s"${thisProject.value.base}/etc/bom.xml").! == 0)
s.log.info(s"${bomFile.getPath} content verified")
}
2 changes: 1 addition & 1 deletion src/sbt-test/dependencies/test/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ lazy val checkTask = Def.task {
val bomFile = (Test / makeBom).value

import scala.sys.process._
require(Seq("diff", "-w", bomFile.getPath, s"${thisProject.value.base}/etc/bom.xml").! == 0)
require(Seq("diff", bomFile.getPath, s"${thisProject.value.base}/etc/bom.xml").! == 0)
s.log.info(s"${bomFile.getPath} content verified")
}
2 changes: 1 addition & 1 deletion src/sbt-test/dependenciesJson/compile/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ lazy val checkTask = Def.task {
s.log.info("Verifying bom content...")
makeBom.value
import scala.sys.process._
require(Seq("diff", "-w", "target/bom.json", s"${thisProject.value.base}/etc/bom.json").! == 0)
require(Seq("diff", "target/bom.json", s"${thisProject.value.base}/etc/bom.json").! == 0)
}
2 changes: 1 addition & 1 deletion src/sbt-test/dependenciesJson/integrationTest/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ lazy val checkTask = Def.task {
val bomFile = (IntegrationTest / makeBom).value

import scala.sys.process._
require(Seq("diff", "-w", bomFile.getPath, s"${thisProject.value.base}/etc/bom.json").! == 0)
require(Seq("diff", bomFile.getPath, s"${thisProject.value.base}/etc/bom.json").! == 0)
s.log.info(s"${bomFile.getPath} content verified")
}
2 changes: 1 addition & 1 deletion src/sbt-test/dependenciesJson/test/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ lazy val checkTask = Def.task {
val bomFile = (Test / makeBom).value

import scala.sys.process._
require(Seq("diff", "-w", bomFile.getPath, s"${thisProject.value.base}/etc/bom.json").! == 0)
require(Seq("diff", bomFile.getPath, s"${thisProject.value.base}/etc/bom.json").! == 0)
s.log.info(s"${bomFile.getPath} content verified")
}
Loading