Merge pull request #56 from unsignedapps/feature/stack-evolution

Added the `--stack-evolution` option

Author: bok-

Sources/CreateXCFramework/Command+Options.swift

@@ -37,6 +37,9 @@ extension Command {
         @Option(help: "The path to a .xcconfig file that can be used to override Xcode build settings. Relative to the package path.")
         var xcconfig: String?
 
+        @Flag(help: "Enables Library Evolution for the whole build stack. Normally we apply it only to the targets listed to be built to work around issues with projects that don't support it.")
+        var stackEvolution: Bool = false
+
         @Option(help: ArgumentHelp("Arbitrary Xcode build settings that are passed directly to the `xcodebuild` invocation. Can be specified multiple times.", valueName: "NAME=VALUE"))
         var xcSetting: [BuildSetting] = []
 

Sources/CreateXCFramework/Command.swift

@@ -77,7 +77,9 @@ struct Command: ParsableCommand {
 
         // we've applied the xcconfig to everything, but some dependencies (*cough* swift-nio)
         // have build errors, so we remove it from targets we're not building
-        try project.enableDistribution(targets: productNames, xcconfig: AbsolutePath(package.distributionBuildXcconfig.path).relative(to: AbsolutePath(package.rootDirectory.path)))
+        if self.options.stackEvolution == false {
+            try project.enableDistribution(targets: productNames, xcconfig: AbsolutePath(package.distributionBuildXcconfig.path).relative(to: AbsolutePath(package.rootDirectory.path)))
+        }
 
         // save the project
         try project.save(to: generator.projectPath)

Sources/CreateXCFramework/PackageInfo.swift

@@ -27,6 +27,10 @@ struct PackageInfo {
             .absoluteURL
     }
 
+    var hasDistributionBuildXcconfig: Bool {
+        self.overridesXcconfig != nil || self.options.stackEvolution == false
+    }
+
     var distributionBuildXcconfig: Foundation.URL {
         return self.projectBuildDirectory
             .appendingPathComponent("Distribution.xcconfig")
@@ -232,7 +236,7 @@ enum SupportedPlatforms {
     case packageValid (plan: [SupportedPlatform])
 }
 
-extension SupportedPlatform: Equatable, Comparable {
+extension SupportedPlatform: Comparable {
     public static func == (lhs: SupportedPlatform, rhs: SupportedPlatform) -> Bool {
         return lhs.platform == rhs.platform && lhs.version == rhs.version
     }

Sources/CreateXCFramework/ProjectGenerator.swift

@@ -38,6 +38,10 @@ struct ProjectGenerator {
 
     /// Writes out the Xcconfig file
     func writeDistributionXcconfig () throws {
+        guard self.package.hasDistributionBuildXcconfig else {
+            return
+        }
+
         try makeDirectories(self.projectPath)
 
         let path = AbsolutePath(self.package.distributionBuildXcconfig.path)
@@ -56,14 +60,6 @@ struct ProjectGenerator {
                 BUILD_LIBRARY_FOR_DISTRIBUTION=YES
                 """
             )
-
-            if package.options.platform.contains(.maccatalyst) {
-                stream (
-                    """
-                    SUPPORTS_MACCATALYST=YES
-                    """
-                )
-            }
         }
     }
 

Sources/CreateXCFramework/XcodeBuilder.swift

@@ -122,8 +122,13 @@ struct XcodeBuilder {
             }
         }
 
+        // enable evolution for the whole stack
+        if self.options.stackEvolution {
+            command.append("BUILD_LIBRARY_FOR_DISTRIBUTION=YES")
+        }
+
         // add build settings provided in the invocation
-        options.xcSetting.forEach { setting in
+        self.options.xcSetting.forEach { setting in
             command.append("\(setting.name)=\(setting.value)")
         }
 

Sources/CreateXCFramework/Zipper.swift

@@ -74,7 +74,7 @@ struct Zipper {
         guard let packageRef = self.package.graph.packages.first(where: { $0.targets.contains(where: { $0.name == target }) }) else { return nil }
 
         guard
-            let dependency = self.package.workspace.state.dependencies[forNameOrIdentity: packageRef.name],
+            let dependency = self.package.workspace.state.dependencies[forNameOrIdentity: packageRef.packageName],
             case let .checkout(checkout) = dependency.state,
             let version = checkout.version
         else {
@@ -91,3 +91,17 @@ struct Zipper {
         try FileManager.default.removeItem(at: file)
     }
 }
+
+#if swift(>=5.5)
+private extension ResolvedPackage {
+    var packageName: String {
+        self.manifestName
+    }
+}
+#else
+private extension ResolvedPackage {
+    var packageName: String {
+        self.name
+    }
+}
+#endif