Skip to content

Fix integration test for Xcode 13 #3686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2021
Merged

Fix integration test for Xcode 13 #3686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IntegrationTests/Fixtures/XCBuild/Libraries/Bar/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PackageDescription
let package = Package(
name: "Bar",
products: [
.library(name: "BarLib", type: .dynamic, targets: ["BarLib"]),
.library(name: "BarLibProduct", type: .dynamic, targets: ["BarLib"]),
Copy link
Contributor

@WowbaggersLiquidLunch WowbaggersLiquidLunch Aug 24, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a nitpick: Would it be valuable to add a FIXME comment to each of these changes? Just in case they get lost. And I think it helps other code readers understand that some cases are not covered in the test.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, that's a good idea. I think I'll do that in a follow up, just to avoid having CI broken for longer.

],
targets: [
.target(name: "BarLib"),
Expand Down
4 changes: 2 additions & 2 deletions IntegrationTests/Fixtures/XCBuild/Libraries/Foo/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import PackageDescription
let package = Package(
name: "Foo",
products: [
.library(name: "FooLib", type: .static, targets: ["FooLib"]),
.library(name: "FooLibProduct", type: .static, targets: ["FooLib"]),
],
dependencies: [
.package(path: "../Bar")
],
targets: [
.target(name: "FooLib", dependencies: ["CFooLib"]),
.target(name: "CFooLib", dependencies: [
.product(name: "BarLib", package: "Bar"),
.product(name: "BarLibProduct", package: "Bar"),
]),
],
swiftLanguageVersions: [.v4_2, .v5]
Expand Down