GitHub/XcodeGen
1
0
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2026-03-18 20:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Supports specifying multiple package products (#1395)

Browse Source 
* Supports specifying multiple package products

* Adds #1395 to CHANGELOG.md

* Updates documentation

* Adds fixture

* Adds changes to pbxproj after changing fixture

* Elaborates on linking options in "Package dependency" section
This commit is contained in:
Simon Støvring
2023-09-11 03:49:38 +02:00
committed by GitHub
parent 73e25e4943
commit 486df5da4d
15 changed files with 203 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -10,6 +10,7 @@
### Fixed
- Fixed source file `includes` not working when no paths were found #1337 @shnhrrsn
- Supports specifying multiple package products #1395 @simonbs
## 2.37.0
Docs/ProjectSpec.md
+17 -1
View File
@@ -645,7 +645,8 @@ targets:
```
**Package dependency**
- [ ] **product**: **String** - The product to use from the package. This defaults to the package name, so is only required if a Package has multiple libraries or a library with a differing name
- [ ] **product**: **String** - The product to use from the package. This defaults to the package name, so is only required if a Package has multiple libraries or a library with a differing name. Use this over `products` when you want to define different linking options per product.
- [ ] **products**: **String** - A list of products to use from the package. This can be used when depending on multiple products from a package.
```yaml
packages:
@@ -663,6 +664,21 @@ targets:
product: SPMUtility
```
Depending on multiple products from a package:
```yaml
packages:
FooFeature:
path: Packages/FooFeature
targets:
App:
dependencies:
- package: FooFeature
products:
- FooDomain
- FooUI
```
### Config Files
Specifies `.xcconfig` files for each configuration.
Sources/ProjectSpec/Dependency.swift
+14 -7
View File
@@ -61,7 +61,7 @@ public struct Dependency: Equatable {
case framework
case carthage(findFrameworks: Bool?, linkType: CarthageLinkType)
case sdk(root: String?)
case package(product: String?)
case package(products: [String])
case bundle
}
}
@@ -69,9 +69,9 @@ public struct Dependency: Equatable {
extension Dependency {
public var uniqueID: String {
switch type {
case .package(let product):
if let product = product {
return "\(reference)/\(product)"
case .package(let products):
if !products.isEmpty {
return "\(reference)/\(products.joined(separator: ","))"
} else {
return reference
}
@@ -106,9 +106,16 @@ extension Dependency: JSONObjectConvertible {
type = .sdk(root: sdkRoot)
reference = sdk
} else if let package: String = jsonDictionary.json(atKeyPath: "package") {
let product: String? = jsonDictionary.json(atKeyPath: "product")
type = .package(product: product)
reference = package
if let products: [String] = jsonDictionary.json(atKeyPath: "products") {
type = .package(products: products)
reference = package
} else if let product: String = jsonDictionary.json(atKeyPath: "product") {
type = .package(products: [product])
reference = package
} else {
type = .package(products: [])
reference = package
}
} else if let bundle: String = jsonDictionary.json(atKeyPath: "bundle") {
type = .bundle
reference = bundle
Sources/XcodeGenKit/PBXProjGenerator.swift
+40 -31
View File
@@ -931,7 +931,7 @@ public class PBXProjGenerator {
}
}
// Embedding handled by iterating over `carthageDependencies` below
case .package(let product):
case .package(let products):
let packageReference = packageReferences[dependency.reference]
// If package's reference is none and there is no specified package in localPackages,
@@ -940,40 +940,49 @@ public class PBXProjGenerator {
continue
}
let productName = product ?? dependency.reference
let packageDependency = addObject(
XCSwiftPackageProductDependency(productName: productName, package: packageReference)
)
// Add package dependency if linking is true.
if dependency.link ?? true {
packageDependencies.append(packageDependency)
}
let link = dependency.link ?? (target.type != .staticLibrary)
if link {
let file = PBXBuildFile(product: packageDependency, settings: getDependencyFrameworkSettings(dependency: dependency))
file.platformFilter = platform
let buildFile = addObject(file)
targetFrameworkBuildFiles.append(buildFile)
} else {
let targetDependency = addObject(
PBXTargetDependency(platformFilter: platform, product: packageDependency)
func addPackageProductDependency(named productName: String) {
let packageDependency = addObject(
XCSwiftPackageProductDependency(productName: productName, package: packageReference)
)
dependencies.append(targetDependency)
// Add package dependency if linking is true.
if dependency.link ?? true {
packageDependencies.append(packageDependency)
}
let link = dependency.link ?? (target.type != .staticLibrary)
if link {
let file = PBXBuildFile(product: packageDependency, settings: getDependencyFrameworkSettings(dependency: dependency))
file.platformFilter = platform
let buildFile = addObject(file)
targetFrameworkBuildFiles.append(buildFile)
} else {
let targetDependency = addObject(
PBXTargetDependency(platformFilter: platform, product: packageDependency)
)
dependencies.append(targetDependency)
}
if dependency.embed == true {
let pbxBuildFile = PBXBuildFile(product: packageDependency,
settings: getEmbedSettings(dependency: dependency, codeSign: dependency.codeSign ?? true))
pbxBuildFile.platformFilter = platform
let embedFile = addObject(pbxBuildFile)
if dependency.copyPhase != nil {
customCopyDependenciesReferences.append(embedFile)
} else {
copyFrameworksReferences.append(embedFile)
}
}
}
if dependency.embed == true {
let pbxBuildFile = PBXBuildFile(product: packageDependency,
settings: getEmbedSettings(dependency: dependency, codeSign: dependency.codeSign ?? true))
pbxBuildFile.platformFilter = platform
let embedFile = addObject(pbxBuildFile)
if dependency.copyPhase != nil {
customCopyDependenciesReferences.append(embedFile)
} else {
copyFrameworksReferences.append(embedFile)
if !products.isEmpty {
for product in products {
addPackageProductDependency(named: product)
}
} else {
addPackageProductDependency(named: dependency.reference)
}
case .bundle:
// Static and dynamic libraries can't copy resources
Tests/Fixtures/SPM/FooFeature/Package.swift
+20
View File
@@ -0,0 +1,20 @@
// swift-tools-version: 5.8
// The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription
let package = Package(
name: "FooFeature",
products: [
.library(name: "FooDomain", targets: [
"FooDomain"
]),
.library(name: "FooUI", targets: [
"FooUI"
])
],
targets: [
.target(name: "FooDomain"),
.target(name: "FooUI")
]
)
Tests/Fixtures/SPM/FooFeature/Sources/FooDomain/FooDomain.swift
+1
View File
@@ -0,0 +1 @@
public struct FooDomain {}
Tests/Fixtures/SPM/FooFeature/Sources/FooUI/FooUI.swift
+1
View File
@@ -0,0 +1 @@
public struct FooUI {}
Tests/Fixtures/SPM/SPM.xcodeproj/project.pbxproj
+44
View File
@@ -23,10 +23,12 @@
/* Begin PBXBuildFile section */
23C6626698DE560017A89F2F /* XcodeGen in Frameworks */ = {isa = PBXBuildFile; productRef = 6F7DEA2D82649EDF903FBDBD /* XcodeGen */; };
2DA7998902987953B119E4CE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26F7EFEE613987D1E1258A60 /* AppDelegate.swift */; };
36CE2E6187D9709BAD9EF807 /* FooUI in Frameworks */ = {isa = PBXBuildFile; productRef = 927CB19D94339CC9960E930C /* FooUI */; };
3986ED6965842721C46C0452 /* SwiftRoaringDynamic in Frameworks */ = {isa = PBXBuildFile; productRef = DC73B269C8B0C0BF6912842C /* SwiftRoaringDynamic */; };
4CC663B42B270404EF5FD037 /* libStaticLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAB5625F6FEA668410ED5482 /* libStaticLibrary.a */; };
9AD886A88D3E4A1B5E900687 /* SPMTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7970A2253B14A9B27C307FAC /* SPMTests.swift */; };
9C4AD0711D706FD3ED0E436D /* StaticLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C17B77601A9D1B7895AB42 /* StaticLibrary.swift */; };
AF8E362713B9D28EA9A5C9FC /* FooDomain in Frameworks */ = {isa = PBXBuildFile; productRef = 8D2DC638BEF7FDF23907E134 /* FooDomain */; };
B89EA0F3859878A1DCF7BAFD /* SwiftRoaringDynamic in Embed Frameworks */ = {isa = PBXBuildFile; productRef = DC73B269C8B0C0BF6912842C /* SwiftRoaringDynamic */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CE46CBA5671B951B546C8673 /* Codability in Frameworks */ = {isa = PBXBuildFile; productRef = 16E6FE01D5BD99F78D4A17E2 /* Codability */; settings = {ATTRIBUTES = (Weak, ); }; };
E368431019ABC696E4FFC0CF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4E22B8BCC18A29EFE1DE3BE4 /* Assets.xcassets */; };
@@ -71,6 +73,7 @@
4E22B8BCC18A29EFE1DE3BE4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
61C17B77601A9D1B7895AB42 /* StaticLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StaticLibrary.swift; sourceTree = "<group>"; };
7970A2253B14A9B27C307FAC /* SPMTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPMTests.swift; sourceTree = "<group>"; };
979AE1767E2AF6B3B9D7F13D /* FooFeature */ = {isa = PBXFileReference; lastKnownFileType = folder; name = FooFeature; path = FooFeature; sourceTree = SOURCE_ROOT; };
A9601593D0AD02931266A4E5 /* App.xctestplan */ = {isa = PBXFileReference; path = App.xctestplan; sourceTree = "<group>"; };
CAB5625F6FEA668410ED5482 /* libStaticLibrary.a */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = archive.ar; path = libStaticLibrary.a; sourceTree = BUILT_PRODUCTS_DIR; };
ED284AB7C13DCC0A95DAA680 /* XcodeGen */ = {isa = PBXFileReference; lastKnownFileType = folder; name = XcodeGen; path = ../../..; sourceTree = SOURCE_ROOT; };
@@ -85,6 +88,8 @@
3986ED6965842721C46C0452 /* SwiftRoaringDynamic in Frameworks */,
4CC663B42B270404EF5FD037 /* libStaticLibrary.a in Frameworks */,
23C6626698DE560017A89F2F /* XcodeGen in Frameworks */,
AF8E362713B9D28EA9A5C9FC /* FooDomain in Frameworks */,
36CE2E6187D9709BAD9EF807 /* FooUI in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -114,6 +119,7 @@
218F6C96DF9E182F526258CF = {
isa = PBXGroup;
children = (
AD0F3623091EEA8D1EA3DFF8 /* Packages */,
17DD374CC81D710476AFF41C /* SPM */,
CF3BD77AEAA56553289456BA /* SPMTests */,
1FA59BFD192FB5A68D5F587C /* StaticLibrary */,
@@ -131,6 +137,14 @@
name = Products;
sourceTree = "<group>";
};
AD0F3623091EEA8D1EA3DFF8 /* Packages */ = {
isa = PBXGroup;
children = (
979AE1767E2AF6B3B9D7F13D /* FooFeature */,
);
name = Packages;
sourceTree = SOURCE_ROOT;
};
CF3BD77AEAA56553289456BA /* SPMTests */ = {
isa = PBXGroup;
children = (
@@ -171,12 +185,16 @@
D85FFB99444DD260A72DDDA7 /* PBXTargetDependency */,
DDD17C561AD5065DF4FA4072 /* PBXTargetDependency */,
C6360997FFC102F6725099D4 /* PBXTargetDependency */,
00B467060F3DEC027711F9C2 /* PBXTargetDependency */,
7EB17E90A4D8F26FEABEEDF6 /* PBXTargetDependency */,
);
name = StaticLibrary;
packageProductDependencies = (
AF233B61592982A7F6431FC6 /* Codability */,
C816AEB28ED71C3C47F31B98 /* SwiftRoaringDynamic */,
5A36E2FE69703FCAC0BE8064 /* XcodeGen */,
6B8A6E1EA485E607A1D1DCD1 /* FooDomain */,
15DB49096E2978F6BCA8D604 /* FooUI */,
);
productName = StaticLibrary;
productReference = CAB5625F6FEA668410ED5482 /* libStaticLibrary.a */;
@@ -202,6 +220,8 @@
16E6FE01D5BD99F78D4A17E2 /* Codability */,
DC73B269C8B0C0BF6912842C /* SwiftRoaringDynamic */,
6F7DEA2D82649EDF903FBDBD /* XcodeGen */,
8D2DC638BEF7FDF23907E134 /* FooDomain */,
927CB19D94339CC9960E930C /* FooUI */,
);
productName = App;
productReference = 097F2DB5622B591E21BC3C73 /* App.app */;
@@ -301,11 +321,19 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
00B467060F3DEC027711F9C2 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = 6B8A6E1EA485E607A1D1DCD1 /* FooDomain */;
};
078202CF7B08B66ACF7FEC23 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3F8D94C4EFC431F646AAFB28 /* StaticLibrary */;
targetProxy = 29147E1DDAEB1AAC20CB0CF9 /* PBXContainerItemProxy */;
};
7EB17E90A4D8F26FEABEEDF6 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = 15DB49096E2978F6BCA8D604 /* FooUI */;
};
8693351DA9DBE579AC9DD513 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C99E3C420D63D5219CE57E33 /* App */;
@@ -635,6 +663,10 @@
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
15DB49096E2978F6BCA8D604 /* FooUI */ = {
isa = XCSwiftPackageProductDependency;
productName = FooUI;
};
16E6FE01D5BD99F78D4A17E2 /* Codability */ = {
isa = XCSwiftPackageProductDependency;
package = 5BA91390AE78D2EE15C60091 /* XCRemoteSwiftPackageReference "Codability" */;
@@ -644,6 +676,10 @@
isa = XCSwiftPackageProductDependency;
productName = XcodeGen;
};
6B8A6E1EA485E607A1D1DCD1 /* FooDomain */ = {
isa = XCSwiftPackageProductDependency;
productName = FooDomain;
};
6F7DEA2D82649EDF903FBDBD /* XcodeGen */ = {
isa = XCSwiftPackageProductDependency;
productName = XcodeGen;
@@ -653,6 +689,14 @@
package = 348C81C327DB1710B742C370 /* XCRemoteSwiftPackageReference "Prefire" */;
productName = "plugin:PrefirePlaybookPlugin";
};
8D2DC638BEF7FDF23907E134 /* FooDomain */ = {
isa = XCSwiftPackageProductDependency;
productName = FooDomain;
};
927CB19D94339CC9960E930C /* FooUI */ = {
isa = XCSwiftPackageProductDependency;
productName = FooUI;
};
AF233B61592982A7F6431FC6 /* Codability */ = {
isa = XCSwiftPackageProductDependency;
package = 5BA91390AE78D2EE15C60091 /* XCRemoteSwiftPackageReference "Codability" */;
Tests/Fixtures/SPM/project.yml
+10
View File
@@ -12,6 +12,8 @@ packages:
XcodeGen:
path: ../../.. #XcodeGen itself
group: SPM
FooFeature:
path: FooFeature
aggregateTargets:
AggTarget:
buildToolPlugins:
@@ -37,6 +39,10 @@ targets:
embed: true
- target: StaticLibrary
- package: XcodeGen
- package: FooFeature
products:
- FooDomain
- FooUI
Tests:
type: bundle.unit-test
platform: iOS
@@ -52,3 +58,7 @@ targets:
- package: SwiftRoaring
product: SwiftRoaringDynamic
- package: XcodeGen
- package: FooFeature
products:
- FooDomain
- FooUI
Tests/ProjectSpecTests/ProjectSpecTests.swift
+3 -3
View File
@@ -156,8 +156,8 @@ class ProjectSpecTests: XCTestCase {
Dependency(type: .framework, reference: "dependency2"),
// multiple package dependencies with different products should be allowed
Dependency(type: .package(product: "one"), reference: "package1"),
Dependency(type: .package(product: "two"), reference: "package1"),
Dependency(type: .package(products: ["one"]), reference: "package1"),
Dependency(type: .package(products: ["two"]), reference: "package1"),
]
),
Target(
@@ -205,7 +205,7 @@ class ProjectSpecTests: XCTestCase {
sources: ["invalidSource"],
dependencies: [
Dependency(type: .target, reference: "invalidDependency"),
Dependency(type: .package(product: nil), reference: "invalidPackage"),
Dependency(type: .package(products: []), reference: "invalidPackage"),
],
preBuildScripts: [BuildScript(script: .path("invalidPreBuildScript"), name: "preBuildScript1")],
postCompileScripts: [BuildScript(script: .path("invalidPostCompileScript"))],
Tests/ProjectSpecTests/SpecLoadingTests.swift
+3 -3
View File
@@ -38,7 +38,7 @@ class SpecLoadingTests: XCTestCase {
"toReplace": Settings(dictionary: ["MY_SETTING2": "VALUE2"]),
]
try expect(project.targets) == [
Target(name: "IncludedTargetNew", type: .application, platform: .tvOS, sources: ["NewSource"], dependencies: [Dependency(type: .package(product: nil), reference: "Yams")]),
Target(name: "IncludedTargetNew", type: .application, platform: .tvOS, sources: ["NewSource"], dependencies: [Dependency(type: .package(products: []), reference: "Yams")]),
Target(name: "NewTarget", type: .application, platform: .iOS, sources: ["template", "target"]),
]
}
@@ -54,7 +54,7 @@ class SpecLoadingTests: XCTestCase {
"toReplace": Settings(dictionary: ["MY_SETTING2": "VALUE2"]),
]
try expect(project.targets) == [
Target(name: "IncludedTargetNew", type: .application, platform: .tvOS, sources: ["NewSource"], dependencies: [Dependency(type: .package(product: nil), reference: "SwiftPM"), Dependency(type: .package(product: nil), reference: "Yams")]),
Target(name: "IncludedTargetNew", type: .application, platform: .tvOS, sources: ["NewSource"], dependencies: [Dependency(type: .package(products: []), reference: "SwiftPM"), Dependency(type: .package(products: []), reference: "Yams")]),
Target(name: "NewTarget", type: .application, platform: .iOS, sources: ["template", "target"]),
]
}
@@ -70,7 +70,7 @@ class SpecLoadingTests: XCTestCase {
"toReplace": Settings(dictionary: ["MY_SETTING2": "VALUE2"]),
]
try expect(project.targets) == [
Target(name: "IncludedTargetNew", type: .application, platform: .tvOS, sources: ["NewSource"], dependencies: [Dependency(type: .package(product: nil), reference: "Yams")]),
Target(name: "IncludedTargetNew", type: .application, platform: .tvOS, sources: ["NewSource"], dependencies: [Dependency(type: .package(products: []), reference: "Yams")]),
Target(name: "NewTarget", type: .application, platform: .iOS, sources: ["template", "target"]),
]
}
Tests/XcodeGenKitTests/GraphVizGeneratorTests.swift
+1 -1
View File
@@ -14,7 +14,7 @@ private let app = Target(
Dependency(type: .carthage(findFrameworks: true, linkType: .static), reference: "MyStaticFramework"),
Dependency(type: .carthage(findFrameworks: true, linkType: .dynamic), reference: "MyDynamicFramework"),
Dependency(type: .framework, reference: "MyExternalFramework"),
Dependency(type: .package(product: "MyPackage"), reference: "MyPackage"),
Dependency(type: .package(products: ["MyPackage"]), reference: "MyPackage"),
Dependency(type: .sdk(root: "MySDK"), reference: "MySDK"),
]
)
Tests/XcodeGenKitTests/PBXProjGeneratorTests.swift
+1 -1
View File
@@ -357,7 +357,7 @@ class PBXProjGeneratorTests: XCTestCase {
let dependency1 = Dependency(type: .target, reference: "TestAll", platformFilter: .all)
let dependency2 = Dependency(type: .target, reference: "TestiOS", platformFilter: .iOS)
let dependency3 = Dependency(type: .target, reference: "TestmacOS", platformFilter: .macOS)
let dependency4 = Dependency(type: .package(product: "Swinject"), reference: "Swinject", platformFilter: .iOS)
let dependency4 = Dependency(type: .package(products: ["Swinject"]), reference: "Swinject", platformFilter: .iOS)
let target = Target(name: "Test", type: .application, platform: .iOS, sources: ["Sources"], dependencies: [dependency1, dependency2, dependency3, dependency4])
let swinjectPackage = SwiftPackage.remote(url: "https://github.com/Swinject/Swinject", versionRequirement: .exact("2.8.0"))
let project = Project(basePath: directoryPath, name: "Test", targets: [target, target1, target2, target3], packages: ["Swinject": swinjectPackage])
Tests/XcodeGenKitTests/ProjectGeneratorTests.swift
+46 -13
View File
@@ -555,12 +555,12 @@ class ProjectGeneratorTests: XCTestCase {
Dependency(type: .target, reference: resourceBundle.name),
Dependency(type: .framework, reference: "FrameworkC.framework"),
Dependency(type: .carthage(findFrameworks: false, linkType: .dynamic), reference: "CarthageA"),
Dependency(type: .package(product: "RxSwift"), reference: "RxSwift"),
Dependency(type: .package(product: "RxCocoa"), reference: "RxSwift"),
Dependency(type: .package(product: "RxRelay"), reference: "RxSwift"),
Dependency(type: .package(products: ["RxSwift"]), reference: "RxSwift"),
Dependency(type: .package(products: ["RxCocoa"]), reference: "RxSwift"),
Dependency(type: .package(products: ["RxRelay"]), reference: "RxSwift"),
// Validate - Do not link package
Dependency(type: .package(product: "KeychainAccess"), reference: "KeychainAccess", link: false),
Dependency(type: .package(products: ["KeychainAccess"]), reference: "KeychainAccess", link: false),
// Statically linked, so don't embed into test
Dependency(type: .target, reference: staticLibrary.name),
@@ -1263,8 +1263,8 @@ class ProjectGeneratorTests: XCTestCase {
type: .application,
platform: .iOS,
dependencies: [
Dependency(type: .package(product: "ProjectSpec"), reference: "XcodeGen"),
Dependency(type: .package(product: nil), reference: "Codability"),
Dependency(type: .package(products: ["ProjectSpec"]), reference: "XcodeGen"),
Dependency(type: .package(products: []), reference: "Codability"),
]
)
@@ -1300,7 +1300,7 @@ class ProjectGeneratorTests: XCTestCase {
type: .application,
platform: .iOS,
dependencies: [
Dependency(type: .package(product: nil), reference: "XcodeGen"),
Dependency(type: .package(products: []), reference: "XcodeGen"),
]
)
@@ -1324,14 +1324,13 @@ class ProjectGeneratorTests: XCTestCase {
try expect(file.product?.productName) == "XcodeGen"
}
$0.it("generates local swift packages with custom xcode path") {
let app = Target(
name: "MyApp",
type: .application,
platform: .iOS,
dependencies: [
Dependency(type: .package(product: nil), reference: "XcodeGen"),
Dependency(type: .package(products: []), reference: "XcodeGen"),
]
)
@@ -1495,6 +1494,40 @@ class ProjectGeneratorTests: XCTestCase {
try expect(NSDictionary(dictionary: expectedInfoPlist).isEqual(to: infoPlist)).beTrue()
}
$0.it("generates local swift packages with multiple products") {
let app = Target(
name: "MyApp",
type: .application,
platform: .iOS,
dependencies: [
Dependency(type: .package(products: ["FooDomain", "FooUI"]), reference: "FooFeature")
]
)
let project = Project(name: "test", targets: [app], packages: [
"FooFeature": .local(path: "../FooFeature", group: nil)
], options: .init(localPackagesGroup: "MyPackages"))
let pbxProject = try project.generatePbxProj(specValidate: false)
let nativeTarget = try unwrap(pbxProject.nativeTargets.first(where: { $0.name == app.name }))
let localPackageFile = try unwrap(pbxProject.fileReferences.first(where: { $0.path == "../FooFeature" }))
try expect(localPackageFile.lastKnownFileType) == "folder"
let frameworkPhases = nativeTarget.buildPhases.compactMap { $0 as? PBXFrameworksBuildPhase }
guard let frameworkPhase = frameworkPhases.first else {
return XCTFail("frameworkPhases should have more than one")
}
guard let files = frameworkPhase.files, files.count == 2 else {
return XCTFail("frameworkPhase should have exactly two files")
}
let productNames = files.compactMap(\.product?.productName)
try expect(productNames).contains { $0 == "FooDomain" }
try expect(productNames).contains { $0 == "FooUI" }
}
}
}
@@ -2978,8 +3011,8 @@ class ProjectGeneratorTests: XCTestCase {
// given
let dependencies = [
Dependency(type: .package(product: "RxSwift"), reference: "RxSwift", embed: true),
Dependency(type: .package(product: "RxCocoa"), reference: "RxSwift", embed: false),
Dependency(type: .package(products: ["RxSwift"]), reference: "RxSwift", embed: true),
Dependency(type: .package(products: ["RxCocoa"]), reference: "RxSwift", embed: false),
]
// when
@@ -2993,8 +3026,8 @@ class ProjectGeneratorTests: XCTestCase {
// given
let dependencies = [
Dependency(type: .package(product: "RxSwift"), reference: "RxSwift", embed: true, copyPhase: BuildPhaseSpec.CopyFilesSettings(destination: .plugins, subpath: "test", phaseOrder: .postCompile)),
Dependency(type: .package(product: "RxCocoa"), reference: "RxSwift", embed: false, copyPhase: BuildPhaseSpec.CopyFilesSettings(destination: .plugins, subpath: "test", phaseOrder: .postCompile)),
Dependency(type: .package(products: ["RxSwift"]), reference: "RxSwift", embed: true, copyPhase: BuildPhaseSpec.CopyFilesSettings(destination: .plugins, subpath: "test", phaseOrder: .postCompile)),
Dependency(type: .package(products: ["RxCocoa"]), reference: "RxSwift", embed: false, copyPhase: BuildPhaseSpec.CopyFilesSettings(destination: .plugins, subpath: "test", phaseOrder: .postCompile)),
]
// when
Tests/XcodeGenKitTests/SchemeGeneratorTests.swift
+1 -1
View File
@@ -487,7 +487,7 @@ class SchemeGeneratorTests: XCTestCase {
type: .application,
platform: .iOS,
dependencies: [
Dependency(type: .package(product: nil), reference: "XcodeGen")
Dependency(type: .package(products: []), reference: "XcodeGen")
],
scheme: targetScheme
)