Embedded Swift Packages Target Recognize Issue (#773)

peripheryapp · Aug 4, 2024 · 9409d5f · 9409d5f
1 parent 2cf67e6
commit 9409d5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Sources/XcodeSupport/XcodeProjectDriver.swift b/Sources/XcodeSupport/XcodeProjectDriver.swift
@@ -32,12 +32,18 @@ public final class XcodeProjectDriver {
             } else {
                 let parts = targetName.split(separator: ".", maxSplits: 1)
 
-                if let packageName = parts.first,
-                   let targetName = parts.last,
-                   let package = project.packageTargets.keys.first(where: { $0.name == packageName }),
-                   let target = project.packageTargets[package]?.first(where: { $0.name == targetName })
-                {
+                guard let packageName = parts.first,
+                      let packageTargetName = parts.last,
+                      let package = project.packageTargets.keys.first(where: { $0.name == packageName })
+                else {
+                    invalidTargetNames.append(targetName)
+                    continue
+                }
+
+                if let target = project.packageTargets[package]?.first(where: { $0.name == packageTargetName }) {
                     packageTargets[package, default: []].insert(target)
+                } else if let subTarget = package.targets.first(where: { $0.name == packageTargetName }) {
+                    packageTargets[package, default: []].insert(subTarget)
                 } else {
                     invalidTargetNames.append(targetName)
                 }

diff --git a/Sources/XcodeSupport/XcodeProjectSetupGuide.swift b/Sources/XcodeSupport/XcodeProjectSetupGuide.swift
@@ -36,7 +36,7 @@ public final class XcodeProjectSetupGuide: SetupGuideHelpers, ProjectSetupGuide
 
             var targets = project.targets.map { $0.name }
             targets += project.packageTargets.flatMap { (package, targets) in
-                targets.map { "\(package.name).\($0.name)" }
+                package.targets.map { "\(package.name).\($0.name)" }
             }
             targets = targets.sorted()