Update XCFramework logic (#2828)

* Update XCFramework logic

This hardcoded platform and architectures before, make it mor generic to
handle macOS on arm64.

(cherry picked from commit f204c90)

* Extend binary target tests to multiple arches (#2831)

In #2812, I updated the logic to support other architectures than just
x86_64, but I did not update the tests. This extends the existing
`testBinaryTargets` with the missing coverage.

(cherry picked from commit c6ec2b4)

Author: neonichu

Sources/Build/BuildPlan.swift

@@ -1711,9 +1711,9 @@ public class BuildPlan {
                 return nil
             }
 
-            // Check that it supports macOS.
+            // Check that it supports the target platform and architecture.
             guard let library = info.libraries.first(where: {
-                $0.platform == "macos" && $0.architectures.contains(Triple.Arch.x86_64.rawValue)
+                return $0.platform == buildParameters.triple.os.asXCFrameworkPlatformString && $0.architectures.contains(buildParameters.triple.arch.rawValue)
             }) else {
                 diagnostics.emit(error: """
                     artifact '\(target.name)' does not support the target platform and architecture \
@@ -1833,3 +1833,15 @@ private func generateResourceInfoPlist(
     try fileSystem.writeIfChanged(path: path, bytes: stream.bytes)
     return true
 }
+
+fileprivate extension Triple.OS {
+    /// Returns a representation of the receiver that can be compared with platform strings declared in an XCFramework.
+    var asXCFrameworkPlatformString: String? {
+        switch self {
+        case .darwin, .linux, .wasi, .windows:
+            return nil // XCFrameworks do not support any of these platforms today.
+        case .macOS:
+            return "macos"
+        }
+    }
+}

Sources/Workspace/InitPackage.swift

@@ -153,8 +153,8 @@ public final class InitPackage {
 
                 var param = ".\(platform.manifestName)("
                 if supportedPlatform.isManifestAPIAvailable {
-                    if platform == .macOS {
-                        param += ".v10_\(version.minor)"
+                    if version.minor > 0 {
+                        param += ".v\(version.major)_\(version.minor)"
                     } else {
                         param += ".v\(version.major)"
                     }
@@ -516,11 +516,11 @@ extension PackageModel.Platform {
 
 extension SupportedPlatform {
     var isManifestAPIAvailable: Bool {
-        if platform == .macOS {
-            guard self.version.major == 10, self.version.patch == 0 else {
+        if platform == .macOS && self.version.major == 10 {
+            guard self.version.patch == 0 else {
                 return false
             }
-        } else if [Platform.iOS, .watchOS, .tvOS].contains(platform) {
+        } else if [Platform.macOS, .iOS, .watchOS, .tvOS].contains(platform) {
             guard self.version.minor == 0, self.version.patch == 0 else {
                 return false
             }
@@ -529,14 +529,16 @@ extension SupportedPlatform {
         }
 
         switch platform {
-        case .macOS:
+        case .macOS where version.major == 10:
             return (10...15).contains(version.minor)
+        case .macOS:
+            return (11...11).contains(version.major)
         case .iOS:
-            return (8...13).contains(version.major)
+            return (8...14).contains(version.major)
         case .tvOS:
-            return (9...13).contains(version.major)
+            return (9...14).contains(version.major)
         case .watchOS:
-            return (2...6).contains(version.major)
+            return (2...7).contains(version.major)
 
         default:
             return false

Tests/BuildTests/BuildPlanTests.swift

@@ -2207,7 +2207,7 @@ final class BuildPlanTests: XCTestCase {
         ])
     }
 
-    func testBinaryTargets() throws {
+    func testBinaryTargets(platform: String, arch: String, destinationTriple: Triple) throws {
         let fs = InMemoryFileSystem(emptyFiles:
             "/Pkg/Sources/exe/main.swift",
             "/Pkg/Sources/Library/Library.swift",
@@ -2227,15 +2227,15 @@ final class BuildPlanTests: XCTestCase {
                     <array>
                         <dict>
                             <key>LibraryIdentifier</key>
-                            <string>macos-x86_64</string>
+                            <string>\(platform)-\(arch)</string>
                             <key>LibraryPath</key>
                             <string>Framework.framework</string>
                             <key>SupportedArchitectures</key>
                             <array>
-                                <string>x86_64</string>
+                                <string>\(arch)</string>
                             </array>
                             <key>SupportedPlatform</key>
-                            <string>macos</string>
+                            <string>\(platform)</string>
                         </dict>
                     </array>
                     <key>CFBundlePackageType</key>
@@ -2258,17 +2258,17 @@ final class BuildPlanTests: XCTestCase {
                     <array>
                         <dict>
                             <key>LibraryIdentifier</key>
-                            <string>macos-x86_64</string>
+                            <string>\(platform)-\(arch)</string>
                             <key>HeadersPath</key>
                             <string>Headers</string>
                             <key>LibraryPath</key>
                             <string>libStaticLibrary.a</string>
                             <key>SupportedArchitectures</key>
                             <array>
-                                <string>x86_64</string>
+                                <string>\(arch)</string>
                             </array>
                             <key>SupportedPlatform</key>
-                            <string>macos</string>
+                            <string>\(platform)</string>
                         </dict>
                     </array>
                     <key>CFBundlePackageType</key>
@@ -2307,7 +2307,7 @@ final class BuildPlanTests: XCTestCase {
         XCTAssertNoDiagnostics(diagnostics)
 
         let result = BuildPlanResult(plan: try BuildPlan(
-            buildParameters: mockBuildParameters(destinationTriple: .macOS),
+            buildParameters: mockBuildParameters(destinationTriple: destinationTriple),
             graph: graph,
             diagnostics: diagnostics,
             fileSystem: fs
@@ -2335,14 +2335,22 @@ final class BuildPlanTests: XCTestCase {
 
         let clibraryBasicArguments = try result.target(for: "CLibrary").clangTarget().basicArguments()
         XCTAssertMatch(clibraryBasicArguments, [.anySequence, "-F", "/path/to/build/debug", .anySequence])
-        XCTAssertMatch(clibraryBasicArguments, [.anySequence, "-I", "/Pkg/StaticLibrary.xcframework/macos-x86_64/Headers", .anySequence])
+        XCTAssertMatch(clibraryBasicArguments, [.anySequence, "-I", "/Pkg/StaticLibrary.xcframework/\(platform)-\(arch)/Headers", .anySequence])
 
         let clibraryLinkArguments = try result.buildProduct(for: "CLibrary").linkArguments()
         XCTAssertMatch(clibraryLinkArguments, [.anySequence, "-F", "/path/to/build/debug", .anySequence])
         XCTAssertMatch(clibraryLinkArguments, [.anySequence, "-L", "/path/to/build/debug", .anySequence])
         XCTAssertMatch(clibraryLinkArguments, ["-lStaticLibrary"])
     }
 
+    func testBinaryTargets() throws {
+        try testBinaryTargets(platform: "macos", arch: "x86_64", destinationTriple: .macOS)
+        let arm64Triple = try Triple("arm64-apple-macosx")
+        try testBinaryTargets(platform: "macos", arch: "arm64", destinationTriple: arm64Triple)
+        let arm64eTriple = try Triple("arm64e-apple-macosx")
+        try testBinaryTargets(platform: "macos", arch: "arm64e", destinationTriple: arm64eTriple)
+    }
+
     func testAddressSanitizer() throws {
         try sanitizerTest(.address, expectedName: "address")
     }