Skip to content
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.

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

Use libSwiftPM instead of custom model types #194

Merged
merged 8 commits into from
Jan 20, 2021

Conversation

yonihemi
Copy link
Member

Resolves #120.

Notes:

  • SwiftPM hasn't tagged new releases since March (oh the irony). I chose to point to main branch (and so TSC also has to point to main to resolve correctly) but if @swiftwasm/carton-team thinks it might be risky we can point to release/5.3 (TSC as well) instead. I prefer main so we don't get stuck if swiftwasm advances in some 5.4 direction and we need the newer resolution.
  • Names changed to reflect the distinction as libSwiftPM does - Manifest is the PackageDescription specified in Package.swift vs PackageModel.Package which includes resolved dependencies. We'll use this when tackling Support resources for package dependencies #175 and Sync JavaScriptKit runtime library with Package.resolved #155.

@yonihemi yonihemi added the refactor No user-visible functionality change label Dec 25, 2020
Package.swift Outdated Show resolved Hide resolved
@yonihemi yonihemi marked this pull request as draft December 25, 2020 12:59
@@ -76,7 +80,7 @@ let package = Package(
name: "SwiftToolchain",
dependencies: [
.product(name: "AsyncHTTPClient", package: "async-http-client"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
Copy link
Collaborator

Choose a reason for hiding this comment

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

This product dependency needs to be preserved, otherwise it causes linking issues on CI.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think it's a difference in resolution between 5.2 and 5.3. Without removing these lines it doesn't resolve on 5.3, and the 5.3 test fails for other reasons.

Copy link
Collaborator

@MaxDesiatov MaxDesiatov Dec 26, 2020

Choose a reason for hiding this comment

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

Fair enough, shouldn't be a problem after #195 is merged, where we have to drop support for 5.2.

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't have access to develop on 5.2 ATM and making guess PRs until it works is not great. I suggest we merge #195 and move on.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Uh, I forgot about this bit. I can test with 5.2 on my side.

Copy link
Member Author

Choose a reason for hiding this comment

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

I mean moving forward, since our dependency graph is large and there are (undocumented?) differences between the versions, plus 5.3 is stable and we have 5.4 to worry about - it's a good time to cut the chord IMO.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Sure, it's the lack of output redirection with WAMR that I'm worried about. I'll try to get that sorted soon and we'll merge #195 after that.

[email protected] Outdated Show resolved Hide resolved
[email protected] Outdated Show resolved Hide resolved
@MaxDesiatov
Copy link
Collaborator

@yonihemi would you mind if I pick this up?

@yonihemi yonihemi marked this pull request as ready for review January 20, 2021 13:04
@MaxDesiatov
Copy link
Collaborator

Could you merge main again please? I've just merged the CI fix there.

[email protected] Outdated Show resolved Hide resolved
Copy link
Collaborator

@MaxDesiatov MaxDesiatov left a comment

Choose a reason for hiding this comment

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

Today is the day! 👏

@MaxDesiatov
Copy link
Collaborator

@yonihemi ready to merge 🎉

@yonihemi yonihemi merged commit 4ef7b53 into swiftwasm:main Jan 20, 2021
@yonihemi yonihemi deleted the refactor-package-manifest branch January 20, 2021 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactor No user-visible functionality change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use libSwiftPM instead of custom model types
2 participants