Skip to content

Use JSKit runtime from SwiftPM resources #335

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

Merged
merged 18 commits into from
May 20, 2022

Conversation

MaxDesiatov
Copy link
Collaborator

@MaxDesiatov MaxDesiatov commented May 11, 2022

Resolves #155.

@MaxDesiatov MaxDesiatov added the enhancement New feature or request label May 11, 2022
@MaxDesiatov

This comment was marked as outdated.

MaxDesiatov added a commit to swiftwasm/JavaScriptKit that referenced this pull request May 12, 2022
Due to the fact that swiftlang/swift-package-manager#4306 will only be available starting with Swift 5.7, we can't generate these resources with a SwiftPM plugin. I propose storing the generated code in the repository directly for now. When 5.7 is released, we can switch to a SwiftPM plugin approach.

Can be tested end-to-end with swiftwasm/carton#335.

Co-authored-by: Yuta Saito <kateinoigakukun@gmail.com>
@MaxDesiatov MaxDesiatov marked this pull request as ready for review May 12, 2022 18:08
@MaxDesiatov MaxDesiatov requested a review from a team May 12, 2022 18:08
j-f1
j-f1 previously approved these changes May 17, 2022
@MaxDesiatov
Copy link
Collaborator Author

MaxDesiatov commented May 17, 2022

@kateinoigakukun LMK if you're busy, I can either wait until you have time to review or merge as is. Thanks!

@kateinoigakukun
Copy link
Member

Ah, give me 30min for review.

@MaxDesiatov
Copy link
Collaborator Author

MaxDesiatov commented May 17, 2022

No worries! I don't want to distract you from your work, but at the same time your input is greatly appreciated, especially as it's a large-ish PR.

Copy link
Member

@kateinoigakukun kateinoigakukun left a comment

Choose a reason for hiding this comment

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

We should report diagnostics when users specify JSKit versions that don't have bundled runtime source.

@@ -201,7 +202,7 @@ public final class Toolchain {
}

public func inferSourcesPaths() throws -> [AbsolutePath] {
let manifest = try self.manifest.get()
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Change applied by the formatter.

@MaxDesiatov
Copy link
Collaborator Author

All CI checks are green now, ready for review 🙂

Copy link
Member

@kateinoigakukun kateinoigakukun left a comment

Choose a reason for hiding this comment

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

LGTM 🦅

@MaxDesiatov MaxDesiatov merged commit 1ba7dd5 into main May 20, 2022
@MaxDesiatov MaxDesiatov deleted the maxd/jskit-swiftpm-resources branch May 20, 2022 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sync JavaScriptKit runtime library with Package.resolved
3 participants