Skip to content

Commit d1f6ae0

Browse files
committed
Try to make it work on x64 macs
1 parent 1e52c77 commit d1f6ae0

File tree

1 file changed

+27
-6
lines changed

1 file changed

+27
-6
lines changed

Package.swift

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,48 @@
11
// swift-tools-version:5.5
22
import PackageDescription
33

4+
#if arch(x86_64)
5+
let macOS = SupportedPlatform.macOS(.v10_10)
6+
let macCatalyst = SupportedPlatform.macCatalyst(.v13)
7+
#else
8+
let macOS = SupportedPlatform.macOS(.v11)
9+
let macCatalyst = SupportedPlatform.macCatalyst(.v14)
10+
#endif
11+
12+
#if (os(macOS) || targetEnvironment(macCatalyst)) && arch(x86_64)
13+
// We still need Half
14+
let halfPackage: [Package.Dependency] = [
15+
.package(url: "https://github.com/SomeRandomiOSDev/Half", from: "1.3.1")
16+
]
17+
let halfTarget: [Target.Dependency] = ["Half"]
18+
#else
19+
let halfPackage: [Package.Dependency] = []
20+
let halfTarget: [Target.Dependency] = []
21+
#endif
22+
23+
24+
425
let package = Package(
526
name: "CBORCoding",
627

728
platforms: [
829
.iOS(.v14),
9-
.macOS(.v11),
30+
macOS,
1031
.tvOS(.v14),
1132
.watchOS(.v7),
12-
.macCatalyst(.v14),
33+
macCatalyst,
1334
],
1435

1536
products: [
1637
.library(name: "CBORCoding", targets: ["CBORCoding"])
1738
],
1839

19-
dependencies: [],
40+
dependencies: halfPackage,
2041

2142
targets: [
22-
.target(name: "CBORCoding", dependencies: []),
23-
.testTarget(name: "CBORCodingTests", dependencies: ["CBORCoding"])
43+
.target(name: "CBORCoding", dependencies: halfTarget),
44+
.testTarget(name: "CBORCodingTests", dependencies: ["CBORCoding"] + halfTarget)
2445
],
2546

26-
swiftLanguageVersions: [.v5]
47+
swiftLanguageVersions: [.version("4.2"), .version("5")]
2748
)

0 commit comments

Comments
 (0)