More linux compatibility with empty dictionary data

Author: phimage

.gitignore

@@ -0,0 +1 @@
+.build

LinuxMain.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.5
 
 import PackageDescription
 

Package.swift

@@ -65,8 +65,16 @@ class OpenStepSerializer {
                 if key == "rootObject" {
                     comment = " /* Project object */"
                 }
-
+#if os(Linux)
+                let row: String
+                if let dict = val as? [AnyHashable: Any], dict.isEmpty { 
+                    row = "\(key) = {\n}\(comment);" // print on linux give [:] ...
+                } else {
+                    row = "\(key) = \(val)\(comment);"
+                }
+#else
                 let row = "\(key) = \(val)\(comment);"
+#endif
                 for line in row.components(separatedBy: "\n") {
                     lines.append("\t\(line)")
                 }

Sources/OpenStepSerializer.swift

@@ -52,12 +52,7 @@ extension XCTestCase {
         do {
             let contents = try String(contentsOf: url)
             let testContents = try String(contentsOf: testURL)
-#if os(Linux)
-            XCTAssertEqual(contents.replacingOccurrences(matchingPattern: "classes = \\{\\s*\\};", by: "classes = [:];"), testContents, "diff \(url.path) \(testURL.path)")
-#else
             XCTAssertEqual(contents, testContents)
-#endif
-
         } catch {
             XCTFail("\(error)")
         }
@@ -67,12 +62,7 @@ extension XCTestCase {
         do {
             let contents = try String(contentsOf: url)
             let testContents = try String(contentsOf: testURL)
-#if os(Linux)
-            XCTAssertNotEqual(contents.replacingOccurrences(matchingPattern: "classes = \\{\\s*\\};", by: "classes = [:];"), testContents, "diff \(url.path) \(testURL.path)")
-#else
             XCTAssertNotEqual(contents, testContents)
-#endif
-
         } catch {
             XCTFail("\(error)")
         }

Tests/Utils.swift

@@ -48,8 +48,7 @@ class XcodeProjKitEditionTests: XCTestCase {
 
                 let testURL = URL(fileURLWithPath: XcodeProjKitEditionTests.directory + resource.replacingOccurrences(of: "ok/", with: "") + "." + XcodeProj.pbxprojFileExtension)
                 try proj.write(to: testURL)
-
-                let testproj = try XcodeProj(url: testURL)
+                let testproj: XcodeProj = try XcodeProj(url: testURL)
                 XCTAssertEqual(PBXProject.Version(major: 12, minor: 0), testproj.project.lastUpgradeCheck)
 
 

Tests/XcodeProjKitEditionTests.swift

@@ -109,8 +109,6 @@ class XcodeProjKitWriteTests: XCTestCase {
                 let testURLPlist = URL(fileURLWithPath: XcodeProjKitWriteTests.directory + resource.replacingOccurrences(of: "ok/", with: "") + ".plist")
                 try proj.write(to: testURLPlist, format: .xml)
                 try XcodeProj(url: testURLPlist).write(to: testURLPlist.appendingPathExtension("pbxproj"), format: .openStep, projectName: proj.projectName, lineEnding: proj.lineEnding)
-                print("\(url.path)")
-                print("\(testURLPlist.appendingPathExtension("pbxproj").path)")
                 assertContentsEqual(url, testURLPlist.appendingPathExtension("pbxproj"))
 
                 // test passing by json before recoding to openstep