simplify normalizeNewlines verified with git core.autocrlf=true; fix for 3769

Author: philwalk

modules/build/src/main/scala/scala/build/internal/AmmUtil.scala

@@ -21,8 +21,7 @@ object AmmUtil {
   def encodeScalaSourcePath(path: Seq[Name]) = path.map(_.backticked).mkString(".")
 
   def normalizeNewlines(s: String)(using newLine: String = lineSeparator): String =
-    s.replace("\r", "").replace("\n", newLine)
+    s.replace("\r", "")
 
-  lazy val lineSeparator: String =
-    if EnvVar.Misc.shell.valueOpt.nonEmpty then "\n" else System.lineSeparator()
+  lazy val lineSeparator: String = "\n"
 }

modules/build/src/test/scala/scala/build/tests/ActionableDiagnosticTests.scala

@@ -23,6 +23,8 @@ class ActionableDiagnosticTests extends TestUtil.ScalaCliBuildSuite {
   )
   val buildThreads = BuildThreads.create()
 
+  def path2url(p: os.Path): String = p.toIO.toURI.toURL.toString
+
   test("using outdated os-lib") {
     val dependencyOsLib = "com.lihaoyi::os-lib:0.7.8"
     val testInputs      = TestInputs(
@@ -160,7 +162,7 @@ class ActionableDiagnosticTests extends TestUtil.ScalaCliBuildSuite {
     )
     val withRepoBuildOptions = baseOptions.copy(
       classPathOptions =
-        baseOptions.classPathOptions.copy(extraRepositories = Seq(s"file:${repoTmpDir.toString}"))
+        baseOptions.classPathOptions.copy(extraRepositories = Seq(path2url(repoTmpDir)))
     )
     testInputs.withBuild(withRepoBuildOptions, buildThreads, None, actionableDiagnostics = true) {
       (_, _, maybeBuild) =>
@@ -222,7 +224,7 @@ class ActionableDiagnosticTests extends TestUtil.ScalaCliBuildSuite {
     val withRepoBuildOptions = baseOptions.copy(
       classPathOptions =
         baseOptions.classPathOptions.copy(extraRepositories =
-          Seq(s"file:${repoTmpDir.toString.replace('\\', '/')}")
+          Seq(path2url(repoTmpDir))
         )
     )
     testInputs.withBuild(withRepoBuildOptions, buildThreads, None, actionableDiagnostics = true) {

modules/build/src/test/scala/scala/build/tests/markdown/MarkdownCodeWrapperTests.scala

@@ -166,28 +166,34 @@ class MarkdownCodeWrapperTests extends TestUtil.ScalaCliBuildSuite {
     expect(result == (None, None, Some(expectedScala)))
   }
 
+  def stringPrep(s: String): String = AmmUtil.normalizeNewlines(s)
+
   test("multiple test Scala snippets are glued together correctly") {
-    val snippet1 =
+    val snippet1 = stringPrep(
       """//> using dep org.scalameta::munit:0.7.29
         |class Test1 extends munit.FunSuite {
         |  assert(true)
         |}""".stripMargin
+    )
     val codeBlock1 = MarkdownCodeBlock(TestScalaInfo, snippet1, 3, 6)
-    val snippet2   =
+    val snippet2   = stringPrep(
       """class Test2 extends munit.FunSuite {
         |  assert(true)
         |}""".stripMargin
+    )
     val codeBlock2             = MarkdownCodeBlock(TestScalaInfo, snippet2, 8, 10)
     val preprocessedCodeBlocks = PreprocessedMarkdownCodeBlocks(Seq(codeBlock1, codeBlock2))
     val markdown               = PreprocessedMarkdown(testCodeBlocks = preprocessedCodeBlocks)
     val expectedScala          = MarkdownCodeWrapper.WrappedMarkdownCode(
-      s"""
-         |
-         |
-         |$snippet1
-         |
-         |$snippet2
-         |""".stripMargin
+      stringPrep(
+        s"""
+           |
+           |
+           |$snippet1
+           |
+           |$snippet2
+           |""".stripMargin
+      )
     )
     val result = MarkdownCodeWrapper(os.sub / "Example.md", markdown)
     showDiffs(result, expectedScala.code)
@@ -208,6 +214,7 @@ class MarkdownCodeWrapperTests extends TestUtil.ScalaCliBuildSuite {
         s.code
       case _ =>
         result.toString
+
     }
     if actual.toString != expect.toString then
       for (((a, b), i) <- (actual zip expect).zipWithIndex)