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
Swift Package Manager 5.3 compatibility #1584
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d47f1f2
move resources and files to be excluded around to play nice with SPM 5.3
designatednerd 49b9969
make codegen options equatable
designatednerd 512fbf3
check what kind of codegen runner we're using before bailing if somet…
designatednerd 7e7cb5b
Update argument setup for nested folders
designatednerd 118e96a
Update ApolloTests to look in resources folder for text files
designatednerd 465bfdf
update codegen tests to account for updated structure
designatednerd 1e702bd
Add fallback package declaration for Swift 5.2
designatednerd File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| // swift-tools-version:5.2 | ||
| // The swift-tools-version declares the minimum version of Swift required to build this package. | ||
|
|
||
| import PackageDescription | ||
|
|
||
| let package = Package( | ||
| name: "Apollo", | ||
| products: [ | ||
| .library( | ||
| name: "ApolloCore", | ||
| targets: ["ApolloCore"]), | ||
| .library( | ||
| name: "Apollo", | ||
| targets: ["Apollo"]), | ||
| .library( | ||
| name: "Apollo-Dynamic", | ||
| type: .dynamic, | ||
| targets: ["Apollo"]), | ||
| .library( | ||
| name: "ApolloCodegenLib", | ||
| targets: ["ApolloCodegenLib"]), | ||
| .library( | ||
| name: "ApolloSQLite", | ||
| targets: ["ApolloSQLite"]), | ||
| .library( | ||
| name: "ApolloWebSocket", | ||
| targets: ["ApolloWebSocket"]), | ||
| ], | ||
| dependencies: [ | ||
| .package( | ||
| url: "https://github.com/stephencelis/SQLite.swift.git", | ||
| .upToNextMinor(from: "0.12.2")), | ||
| .package( | ||
| url: "https://github.com/daltoniam/Starscream", | ||
| .upToNextMinor(from: "3.1.1")), | ||
| .package( | ||
| url: "https://github.com/stencilproject/Stencil.git", | ||
| .upToNextMinor(from: "0.14.0")), | ||
| .package( | ||
| url: "https://github.com/apollographql/InflectorKit", | ||
| .upToNextMinor(from: "0.0.2")), | ||
| ], | ||
| targets: [ | ||
| .target( | ||
| name: "ApolloCore", | ||
| dependencies: []), | ||
| .target( | ||
| name: "Apollo", | ||
| dependencies: [ | ||
| "ApolloCore", | ||
| ]), | ||
| .target( | ||
| name: "ApolloCodegenLib", | ||
| dependencies: [ | ||
| "ApolloCore", | ||
| "InflectorKit", | ||
| .product(name: "Stencil", package: "Stencil"), | ||
| ]), | ||
| .target( | ||
| name: "ApolloSQLite", | ||
| dependencies: [ | ||
| "Apollo", | ||
| .product(name: "SQLite", package: "SQLite.swift"), | ||
| ]), | ||
| .target( | ||
| name: "ApolloSQLiteTestSupport", | ||
| dependencies: [ | ||
| "ApolloSQLite", | ||
| "ApolloTestSupport" | ||
| ]), | ||
| .target( | ||
| name: "ApolloWebSocket", | ||
| dependencies: [ | ||
| "Apollo", | ||
| "ApolloCore", | ||
| .product(name: "Starscream", package: "Starscream"), | ||
| ]), | ||
| .target( | ||
| name: "ApolloTestSupport", | ||
| dependencies: [ | ||
| "Apollo", | ||
| ]), | ||
| .target( | ||
| name: "GitHubAPI", | ||
| dependencies: [ | ||
| "Apollo", | ||
| ]), | ||
| .target( | ||
| name: "StarWarsAPI", | ||
| dependencies: [ | ||
| "Apollo", | ||
| ]), | ||
| .target( | ||
| name: "UploadAPI", | ||
| dependencies: [ | ||
| "Apollo", | ||
| ]), | ||
| .testTarget( | ||
| name: "ApolloTests", | ||
| dependencies: [ | ||
| "ApolloTestSupport", | ||
| "StarWarsAPI", | ||
| "UploadAPI" | ||
| ]), | ||
| .testTarget( | ||
| name: "ApolloCacheDependentTests", | ||
| dependencies: [ | ||
| "ApolloSQLiteTestSupport", | ||
| "StarWarsAPI", | ||
| ]), | ||
| .testTarget( | ||
| name: "ApolloCodegenTests", | ||
| dependencies: [ | ||
| "ApolloTestSupport", | ||
| "ApolloCodegenLib" | ||
| ]), | ||
| .testTarget( | ||
| name: "ApolloSQLiteTests", | ||
| dependencies: [ | ||
| "ApolloSQLiteTestSupport", | ||
| "StarWarsAPI" | ||
| ]), | ||
| .testTarget( | ||
| name: "ApolloWebsocketTests", | ||
| dependencies: [ | ||
| "ApolloWebSocket", | ||
| "ApolloTestSupport", | ||
| "StarWarsAPI", | ||
| ]), | ||
| ] | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Once default codegen becomes swift codegen, this will fail the tests that check that a folder URL can't be passed in here.