more platform line separators

Author: puredanger

src/main/clojure/clojure/tools/build/tasks/uber.clj

@@ -68,7 +68,7 @@
 
 (defn- conflict-append
   [{:keys [path in]}]
-  {:write {path {:string (str "\n" (stream->string in)), :append true}}})
+  {:write {path {:string (str (System/lineSeparator) (stream->string in)), :append true}}})
 
 (defn- conflict-append-dedupe
   [{:keys [path in ^File existing state] :as _params}]
@@ -82,7 +82,7 @@
       {:state (assoc-in state [:append-dedupe path] seen)}
       ;; record and append
       {:state (assoc-in state [:append-dedupe path] (conj seen new-content))
-       :write {path {:string (str "\n" new-content), :append true}}})))
+       :write {path {:string (str (System/lineSeparator) new-content), :append true}}})))
 
 (defn conflict-data-readers
   [{:keys [path in ^File existing]}]

src/test/clojure/clojure/tools/build/tasks/test_uber.clj

@@ -127,12 +127,12 @@
           (slurp (project-path "target/unzip/overwrite.txt"))))
 
     ;; append files append
-    (is (= (str (slurp (project-path "j1/append.txt")) "\n"
+    (is (= (str (slurp (project-path "j1/append.txt")) (System/lineSeparator)
              (slurp (project-path "j2/append.txt")))
           (slurp (project-path "target/unzip/append.txt"))))
 
     ;; LICENSE files append but no dupes - include j1 and j2, but not j3 (dupe of j1)
-    (is (= (str (slurp (project-path "j1/META-INF/LICENSE.txt")) "\n"
+    (is (= (str (slurp (project-path "j1/META-INF/LICENSE.txt")) (System/lineSeparator)
              (slurp (project-path "j2/META-INF/LICENSE.txt")))
           (slurp (project-path "target/unzip/META-INF/LICENSE.txt"))))))