Skip to content

Cleanup PackageGraph Module #2992

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 27 commits into from
Oct 23, 2020
Merged

Conversation

mattt
Copy link
Contributor

@mattt mattt commented Oct 21, 2020

Another incremental PR working toward an implementation of #2967, this time targeting the PackageGraph module. I'd been holding onto this one, waiting for #2980 was all settled.

This should be the last one of these custodial PRs. Once this is in, I'll have some actual functional additions to share for the package registry.

As always, feel free to push back on any of these if they're at all controversial. These are just some changes that I found to help my own understanding of what's inside PackageGraph, and how these APIs relate to each other.

mattt added 26 commits October 21, 2020 09:32
Change BasePackageContainer initializer to internal access
…ontainer.swift

Reorder RepositoryPackageContainer declarations
Move nameForDiagnostics helper method into fileprivate extension
Make productFilter public

Fix documentation comment for productFilter
@mattt
Copy link
Contributor Author

mattt commented Oct 21, 2020

@swift-ci please smoke test

@neonichu neonichu self-assigned this Oct 21, 2020
@mattt
Copy link
Contributor Author

mattt commented Oct 22, 2020

@abertelrud @neonichu Actually, one last question: What's the preferred method of merging a PR in this project? Merge commit, squash, or rebase?

@neonichu
Copy link
Contributor

Squash is what we commonly use.

@mattt
Copy link
Contributor Author

mattt commented Oct 23, 2020

Nice. I think that's the right way to go for most PRs, as well. Doing that now.

@mattt mattt merged commit 9075543 into swiftlang:main Oct 23, 2020
@mattt mattt deleted the packagegraph-module-cleanup branch October 23, 2020 16:44
federicobucchi pushed a commit to federicobucchi/swift-package-manager that referenced this pull request Jan 6, 2021
* Extract PackageRequirement into separate file

* Extract PackageContainer into separate file

* Move BasePackageContainer to PackageContainer file

Change BasePackageContainer initializer to internal access

* Extract LocalPackageContainer into separate file

* Rename RepositoryPackageContainerProvider.swift to RepositoryPackageContainer.swift

Reorder RepositoryPackageContainer declarations

* Move CheckoutState.requirement to original type declaration

* Extract BoundVersion to separate file

* Extract DependencyResolutionNode to separate file

* Extract GraphLoadingNode to separate file

* Move PackageGraphError to PackageGraph declaration

* Extract diagnostics concerns to separate file

* Rename RawPackageConstraints.swift to PackageModel+Extensions.swift

* Refactor PackageGraphLoader functionality into extension on PackageGraph

* Extract Pubgrub resolver into separate files

* Conform to protocols in extensions

* Use built-in Result type

* Convert requirement to computed property

* Convert nameForDiagnostics into computed property

Move nameForDiagnostics helper method into fileprivate extension

* Convert productFilter into computed property

Make productFilter public

Fix documentation comment for productFilter

* Remove leading underscore for public property isRemoteContainer

* Move PackageReference extension into PackageModel+Extensions

* Extract extension on Version into separate file

* Make constrained extension on Range fileprivate

* Reorganize PinsStore protocol conformance and headings

* Move findCycles helper function to PackageGraph+Loading

Make findCycles fileprivate

* Remove unused delegate APIs for DependencyResolver

* Fix CMakeLists source list
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.

3 participants