Skip to content

Commit 5368a83

Browse files
committed
Use SystemPackage for linux
1 parent 2c8165b commit 5368a83

File tree

8 files changed

+46
-8
lines changed

8 files changed

+46
-8
lines changed

Package.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ let package = Package(
1313
dependencies: [
1414
.package(url: "https://github.com/apple/swift-algorithms.git", from: "1.2.0"),
1515
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.6.0"),
16+
.package(url: "https://github.com/apple/swift-system.git", from: "1.5.0"),
1617
.package(url: "https://github.com/swiftlang/swift-subprocess.git", branch: "main"),
1718
.package(url: "https://github.com/swiftlang/swift-syntax.git", from: "601.0.0"),
1819
],
@@ -25,6 +26,7 @@ let package = Package(
2526
"MutationKit",
2627
"PackageKit",
2728
.product(name: "ArgumentParser", package: "swift-argument-parser"),
29+
.product(name: "SystemPackage", package: "swift-system"),
2830
]
2931
),
3032

@@ -86,13 +88,15 @@ let package = Package(
8688
name: "PackageKit",
8789
dependencies: [
8890
.product(name: "Subprocess", package: "swift-subprocess"),
91+
.product(name: "SystemPackage", package: "swift-system"),
8992
]
9093
),
9194

9295
.testTarget(
9396
name: "PackageKitTests",
9497
dependencies: [
95-
"PackageKit"
98+
"PackageKit",
99+
.product(name: "SystemPackage", package: "swift-system"),
96100
],
97101
resources: [
98102
.copy("TestPackages"),

Sources/MutationTesting/MutationTesting.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ import CoreMutation
33
import Foundation
44
import MutationKit
55
import PackageKit
6-
import System
6+
7+
#if canImport(System)
8+
@preconcurrency import System
9+
#else
10+
@preconcurrency import SystemPackage
11+
#endif
712

813
@main
914
struct MutationTesting: AsyncParsableCommand {

Sources/PackageKit/Package.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import Foundation
22
import Subprocess
3-
import System
3+
4+
#if canImport(System)
5+
@preconcurrency import System
6+
#else
7+
@preconcurrency import SystemPackage
8+
#endif
49

510
public struct Package: Equatable, Hashable {
611
public let name: Name

Sources/PackageKit/Source.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import Foundation
2-
import System
2+
3+
#if canImport(System)
4+
@preconcurrency import System
5+
#else
6+
@preconcurrency import SystemPackage
7+
#endif
38

49
public struct Source: Equatable, Hashable, Sendable {
510
public let name: Name

Sources/PackageKit/Target.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import System
1+
#if canImport(System)
2+
@preconcurrency import System
3+
#else
4+
@preconcurrency import SystemPackage
5+
#endif
26

37
public struct Target: Equatable, Hashable {
48
public let name: Name

Tests/PackageKitTests/FileManagerTests.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import Foundation
22
@testable import PackageKit
3-
import System
43
import Testing
54

5+
#if canImport(System)
6+
@preconcurrency import System
7+
#else
8+
@preconcurrency import SystemPackage
9+
#endif
10+
611
@Suite("FileManager")
712
struct FileManagerTests {
813

Tests/PackageKitTests/Helpers/Package.Path+TestPackages.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import Foundation
22
@testable import PackageKit
3-
import System
43
import Testing
54

5+
#if canImport(System)
6+
@preconcurrency import System
7+
#else
8+
@preconcurrency import SystemPackage
9+
#endif
10+
611
extension Package.Path {
712

813
init(test: Package.Name) throws {

Tests/PackageKitTests/PackageTests.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import Foundation
22
@testable import PackageKit
3-
import System
43
import Testing
54

5+
#if canImport(System)
6+
@preconcurrency import System
7+
#else
8+
@preconcurrency import SystemPackage
9+
#endif
10+
611
@Suite("Package")
712
struct PackageTests {
813

0 commit comments

Comments
 (0)