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

merge: feature/defer update to main #116

Merged
merged 19 commits into from
Nov 1, 2023

Conversation

calvincestari
Copy link
Member

@calvincestari calvincestari commented Oct 31, 2023

This is the changeset of merging main into the feature/defer branch. Done as a separate PR to validate the changes particularly for the mega async/await changes in main.

This PR is not expected to build until CCN is removed; that will be in a separate PR shortly. Done with 0a7a72d.

BobaFetters and others added 17 commits October 25, 2023 12:42
070ea51 Update ROADMAP.md

git-subtree-dir: apollo-ios
git-subtree-split: 070ea51
git-subtree-dir: apollo-ios-codegen
git-subtree-mainline: 266d3a6
git-subtree-split: 724674751239f30176ebdd0581f2f70bc6e250f2
72467475 Codegen async/await Mega PR (#57)

git-subtree-dir: apollo-ios-codegen
git-subtree-split: 724674751239f30176ebdd0581f2f70bc6e250f2
21cacc4d Escape quotation marks in operation manifest body (#111)

git-subtree-dir: apollo-ios-codegen
git-subtree-split: 21cacc4d5eabe49479d82f8c521b1d9f55da1ae4
…tion manifest body

git-subtree-dir: apollo-ios-codegen
git-subtree-mainline: 31f91e2
git-subtree-split: 21cacc4d5eabe49479d82f8c521b1d9f55da1ae4
# Conflicts:
#	Tests/ApolloCodegenTests/AnimalKingdomAPI/AnimalKingdomIRCreationTests.swift
#	Tests/ApolloCodegenTests/ApolloCodegenTests.swift
#	Tests/ApolloCodegenTests/CodeGenIR/IRRootFieldBuilderTests.swift
#	Tests/ApolloCodegenTests/CodeGeneration/Templates/SelectionSet/SelectionSetTemplateTests.swift
#	Tests/ApolloCodegenTests/Frontend/CompilationTests.swift
#	apollo-ios-codegen/Sources/GraphQLCompiler/CompilationResult.swift
#	apollo-ios-codegen/Sources/IR/IR+RootFieldBuilder.swift
#	apollo-ios-codegen/Sources/IR/IRBuilder.swift
calvincestari and others added 2 commits October 31, 2023 13:10
Will be fixed correctly in the next PR.
@calvincestari calvincestari merged commit 1b25bee into feature/defer Nov 1, 2023
@calvincestari calvincestari deleted the defer/update-to-main branch November 1, 2023 16:38
BobaFetters pushed a commit that referenced this pull request Nov 2, 2023
9759ba2 merge:  branch into  (#121)
d5c6b1f 2023-11-02 Roadmap update
5cc8f75 Merge branch 'main' into feature/defer
98dfa68 merge: `feature/defer` update to `main` (#116)
1a7bde4 Merge branch 'main' into feature/defer
60d4dc4 Merge branch 'main' into feature/defer
773b890 Merge branch 'main' into feature/defer
b574fbc Merge branch 'main' into feature/defer
72306f7 feature: Operation definition template supports the `@defer` directive (#31)
98c06c6 Merge branch 'project-breakup' into feature/defer
febc191 rfc: Clarifying edits (#22)
0b563c9 Migrating defer branch to new project structure

git-subtree-dir: apollo-ios
git-subtree-split: 9759ba2
BobaFetters pushed a commit that referenced this pull request Nov 2, 2023
f499efa4 chore: Disable `@defer` support (#122)
70fd68cd Merge branch 'main' into feature/defer
d6c49617 Defer Selection Set Template - Basic (W/clean up) (#118)
f5dc1758 merge: `feature/defer` update to `main` (#116)
2c5463b0 refactor: [1/x] Refactor root field builder for deferred fragments (#74)
25d44b83 Merge branch 'main' into feature/defer
1d8424d3 Merge branch 'main' into feature/defer
a8c31ca3 Merge branch 'main' into feature/defer
d1a3c0ab feature: Operation definition template supports the `@defer` directive (#31)
6a01891b Merge branch 'project-breakup' into feature/defer
11cf5828 Merge branch 'project-breakup' into feature/defer
723b8648 refactor: Don't require `label` argument for deferred named fragments (#33)
9041eee0 feature: Require `label` argument on `@defer` directive (#28)
01b81541 Migrating defer branch to new project structure

git-subtree-dir: apollo-ios-codegen
git-subtree-split: f499efa4ee99c7eb86e5f2e6d0b630756c48f0de
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.

6 participants