linux adjustments (#3051)

motivation: broken build on older swift versions for linux

changes: replace unsupported functions with supported ones

Author: tomerd

Sources/PackageCollections/Storage/PackageCollectionsProfileStorage.swift

@@ -97,10 +97,12 @@ struct FilePackageCollectionsProfileStorage: PackageCollectionsProfileStorage {
         self.path = path ?? fileSystem.dotSwiftPM.appending(component: "\(name).json")
 
         self.encoder = JSONEncoder()
-        self.encoder.outputFormatting = .prettyPrinted
-        if #available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) {
-            self.encoder.outputFormatting.insert(.sortedKeys)
-            self.encoder.outputFormatting.insert(.withoutEscapingSlashes)
+        if #available(macOS 10.15, *) {
+            #if os(macOS)
+            encoder.outputFormatting = [.sortedKeys, .prettyPrinted, .withoutEscapingSlashes]
+            #else // `.withoutEscapingSlashes` is not in 5.3 on non-Darwin platforms
+            encoder.outputFormatting = [.sortedKeys, .prettyPrinted]
+            #endif
         }
         self.decoder = JSONDecoder()
     }

Tests/PackageCollectionsTests/PackageCollectionsTests.swift

@@ -379,7 +379,7 @@ final class PackageCollectionsTests: XCTestCase {
         let start = Date()
         let list = try tsc_await { callback in packageCollections.listCollections(callback: callback) }
         XCTAssertEqual(list.count, mockCollections.count, "list count should match")
-        let delta = start.distance(to: Date())
+        let delta = Date().timeIntervalSince(start)
         XCTAssert(delta < 1.0, "should list quickly, took \(delta)")
     }
 
@@ -511,7 +511,7 @@ final class PackageCollectionsTests: XCTestCase {
         let repoName = mockCollections.last!.packages.last!.repository.basename
         let searchResult = try tsc_await { callback in packageCollections.findPackages(repoName, callback: callback) }
         XCTAssert(searchResult.items.count > 0, "should get results")
-        let delta = start.distance(to: Date())
+        let delta = Date().timeIntervalSince(start)
         XCTAssert(delta < 1.0, "should search quickly, took \(delta)")
     }
 
@@ -617,7 +617,7 @@ final class PackageCollectionsTests: XCTestCase {
         let targetName = mockCollections.last!.packages.last!.versions.last!.targets.last!.name
         let searchResult = try tsc_await { callback in packageCollections.findTargets(targetName, searchType: .exactMatch, callback: callback) }
         XCTAssert(searchResult.items.count > 0, "should get results")
-        let delta = start.distance(to: Date())
+        let delta = Date().timeIntervalSince(start)
         XCTAssert(delta < 1.0, "should search quickly, took \(delta)")
     }
 
@@ -1026,7 +1026,7 @@ final class PackageCollectionsTests: XCTestCase {
         let start = Date()
         let metadata = try tsc_await { callback in packageCollections.getPackageMetadata(mockPackage.reference, callback: callback) }
         XCTAssertNotNil(metadata)
-        let delta = start.distance(to: Date())
+        let delta = Date().timeIntervalSince(start)
         XCTAssert(delta < 1.0, "should fetch quickly, took \(delta)")
     }