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

fix: Updates Swift Package.resolved file version format #304

Merged
merged 2 commits into from
Mar 20, 2024

Conversation

calvincestari
Copy link
Member

@calvincestari calvincestari commented Mar 18, 2024

Fixes apollographql/apollo-ios#3355.

This is the fix to accept version 3 as a valid format for the version checker.

Copy link

netlify bot commented Mar 18, 2024

Deploy Preview for apollo-ios-docc canceled.

Name Link
🔨 Latest commit ec2b045
🔍 Latest deploy log https://app.netlify.com/sites/apollo-ios-docc/deploys/65f9e96f7088950008322e77

Copy link

netlify bot commented Mar 18, 2024

Deploy Preview for eclectic-pie-88a2ba canceled.

Name Link
🔨 Latest commit ec2b045
🔍 Latest deploy log https://app.netlify.com/sites/eclectic-pie-88a2ba/deploys/65f9e96f95d4da0008766c5b

@calvincestari calvincestari marked this pull request as ready for review March 19, 2024 19:37
}

func test__matchCLIVersionToApolloVersion__givenPackageResolvedFileInXcodeWorkspaceAndProject_withVersion2FileFormat_hasMatchingVersion_returns_versionMatch_fromWorkspace() throws {
func test__matchCLIVersionToApolloVersion__givenPackageResolvedFileInXcodeWorkspaceAndProject_withKnownResolvedFileFormats_hasMatchingVersion_returns_versionMatch_fromWorkspace() throws {
Copy link
Member Author

Choose a reason for hiding this comment

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

This test was changed to have both the workspace and project use the same Apollo version. Previously they were different and that could also affect the outcome. So this test was changed and there is a new test below that has mismatched versions to ensure that the workspace one is still selected.

Copy link
Contributor

@AnthonyMDev AnthonyMDev left a comment

Choose a reason for hiding this comment

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

Thanks for this!

@calvincestari calvincestari merged commit 6333d1a into main Mar 20, 2024
24 checks passed
@calvincestari calvincestari deleted the fix/swift-package-resolved-v3 branch March 20, 2024 20:26
BobaFetters pushed a commit that referenced this pull request Mar 20, 2024
BobaFetters pushed a commit to apollographql/apollo-ios-codegen that referenced this pull request Mar 20, 2024
BobaFetters pushed a commit that referenced this pull request Mar 20, 2024
117e41c3 fix: Updates Swift  file version format (#304)

git-subtree-dir: apollo-ios-codegen
git-subtree-split: 117e41c33393b6abae6842f8a0fbe498611668ca
BobaFetters pushed a commit that referenced this pull request Mar 20, 2024
… format

git-subtree-dir: apollo-ios-codegen
git-subtree-mainline: 1ff20e5
git-subtree-split: 117e41c33393b6abae6842f8a0fbe498611668ca
jamesonwilliams pushed a commit to jamesonwilliams/apollo-ios-dev that referenced this pull request Mar 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for SPM Package.resolved version 3
2 participants