-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
[swift5] update new minimum OS supported versions #13667
Merged
4brunu
merged 4 commits into
OpenAPITools:7.0.x
from
4brunu:feature/drop-old-apple-platforms-7.0.x
Oct 12, 2022
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
8 changes: 4 additions & 4 deletions
8
modules/openapi-generator/src/main/resources/swift5/Cartfile.mustache
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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| github "Flight-School/AnyCodable" ~> 0.6.1{{#useAlamofire}} | ||
| github "Alamofire/Alamofire" ~> 5.4.3{{/useAlamofire}}{{#usePromiseKit}} | ||
| github "mxcl/PromiseKit" ~> 6.15.3{{/usePromiseKit}}{{#useRxSwift}} | ||
| github "ReactiveX/RxSwift" ~> 6.2.0{{/useRxSwift}} | ||
| github "Flight-School/AnyCodable" ~> 0.6.6{{#useAlamofire}} | ||
| github "Alamofire/Alamofire" ~> 5.6.2{{/useAlamofire}}{{#usePromiseKit}} | ||
| github "mxcl/PromiseKit" ~> 6.18.1{{/usePromiseKit}}{{#useRxSwift}} | ||
| github "ReactiveX/RxSwift" ~> 6.5.0{{/useRxSwift}} |
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 |
|---|---|---|
| @@ -1,17 +1,10 @@ | ||
| Pod::Spec.new do |s| | ||
| s.name = '{{projectName}}'{{#projectDescription}} | ||
| s.summary = '{{.}}'{{/projectDescription}} | ||
| {{#useAlamofire}} | ||
| s.ios.deployment_target = '10.0' | ||
| s.osx.deployment_target = '10.12' | ||
| s.tvos.deployment_target = '10.0' | ||
| {{/useAlamofire}} | ||
| {{^useAlamofire}} | ||
| s.ios.deployment_target = '9.0' | ||
| s.osx.deployment_target = '10.11' | ||
| s.tvos.deployment_target = '9.0' | ||
| {{/useAlamofire}} | ||
| s.watchos.deployment_target = '3.0' | ||
| s.ios.deployment_target = '11.0' | ||
| s.osx.deployment_target = '10.13' | ||
| s.tvos.deployment_target = '11.0' | ||
| s.watchos.deployment_target = '4.0' | ||
| s.version = '{{podVersion}}{{^podVersion}}{{#apiInfo}}{{version}}{{/apiInfo}}{{^apiInfo}}}0.0.1{{/apiInfo}}{{/podVersion}}' | ||
| s.source = {{#podSource}}{{& podSource}}{{/podSource}}{{^podSource}}{ :git => '[email protected]:OpenAPITools/openapi-generator.git', :tag => 'v{{#apiInfo}}{{version}}{{/apiInfo}}{{^apiInfo}}}0.0.1{{/apiInfo}}' }{{/podSource}} | ||
| {{#podAuthors}} | ||
|
|
@@ -33,14 +26,14 @@ Pod::Spec.new do |s| | |
| s.documentation_url = '{{.}}' | ||
| {{/podDocumentationURL}} | ||
| s.source_files = '{{swiftPackagePath}}{{^swiftPackagePath}}{{#useSPMFileStructure}}Sources/{{projectName}}{{/useSPMFileStructure}}{{^useSPMFileStructure}}{{projectName}}/Classes{{/useSPMFileStructure}}{{/swiftPackagePath}}/**/*.swift' | ||
| s.dependency 'AnyCodable-FlightSchool', '~> 0.6.1' | ||
| s.dependency 'AnyCodable-FlightSchool', '~> 0.6.6' | ||
| {{#useAlamofire}} | ||
| s.dependency 'Alamofire', '~> 5.4.3' | ||
| s.dependency 'Alamofire', '~> 5.6.2' | ||
| {{/useAlamofire}} | ||
| {{#usePromiseKit}} | ||
| s.dependency 'PromiseKit/CorePromise', '~> 6.15.3' | ||
| s.dependency 'PromiseKit/CorePromise', '~> 6.18.1' | ||
| {{/usePromiseKit}} | ||
| {{#useRxSwift}} | ||
| s.dependency 'RxSwift', '~> 6.2.0' | ||
| s.dependency 'RxSwift', '~> 6.5.0' | ||
| {{/useRxSwift}} | ||
| end | ||
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
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 |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| github "Flight-School/AnyCodable" ~> 0.6.1 | ||
| github "Alamofire/Alamofire" ~> 5.4.3 | ||
| github "Flight-School/AnyCodable" ~> 0.6.6 | ||
| github "Alamofire/Alamofire" ~> 5.6.2 |
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
12 changes: 6 additions & 6 deletions
12
samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.podspec
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 |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| Pod::Spec.new do |s| | ||
| s.name = 'PetstoreClient' | ||
| s.ios.deployment_target = '10.0' | ||
| s.osx.deployment_target = '10.12' | ||
| s.tvos.deployment_target = '10.0' | ||
| s.watchos.deployment_target = '3.0' | ||
| s.ios.deployment_target = '11.0' | ||
| s.osx.deployment_target = '10.13' | ||
| s.tvos.deployment_target = '11.0' | ||
| s.watchos.deployment_target = '4.0' | ||
| s.version = '1.0.0' | ||
| s.source = { :git => '[email protected]:OpenAPITools/openapi-generator.git', :tag => 'v1.0.0' } | ||
| s.authors = '' | ||
| s.license = 'Proprietary' | ||
| s.homepage = 'https://github.com/openapitools/openapi-generator' | ||
| s.summary = 'PetstoreClient' | ||
| s.source_files = 'PetstoreClient/Classes/**/*.swift' | ||
| s.dependency 'AnyCodable-FlightSchool', '~> 0.6.1' | ||
| s.dependency 'Alamofire', '~> 5.4.3' | ||
| s.dependency 'AnyCodable-FlightSchool', '~> 0.6.6' | ||
| s.dependency 'Alamofire', '~> 5.6.2' | ||
| end |
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
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
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| github "Flight-School/AnyCodable" ~> 0.6.1 | ||
| github "Flight-School/AnyCodable" ~> 0.6.6 |
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
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.
I wonder whether we could be a bit less restrictive here and only pin major versions instead of major and minor version. With
~> 5.6.2we only allow 5.6.2 and all following patch updates for it. This might not be a problem if there is no other dependency to Alamofire in a project but otherwise a project could never resolve Alamofire 5.7+ versions and is forced to stay on minor version 5.6* until generator is updated again. As Alamofire version policy is also based on semantic versioning this might be ok I think. Just a thought that crossed my mindThere 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.
Hey, I agree with you.
Do you suggest keeping the 5.4.3?
Or update it?
Thanks
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.
Hey. I would probably still allow the lower AF versions as I know some dependencies still require 5.4*. That's why my suggestion would be to use
~> 5.4modifier to not break dependency resolution for those.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.
Done 👍
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.
~> 5.4.0will only allow up to the next minor version, so e.g. AF 5.5.0 would already not be possible to resolve anymore. I think in order to support everything from 5.4.0 until (and not including) the next major version we would need to use~> 5.4instead. Then we would also allow 5.5.x, 5.6.y and so onThere 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.
What about now?
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.
CI is failing... Maybe I will try to revert the dependencies changes and save that for another PR
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.
Yes agree its probably better to do this in a separate PR
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.
@Jonas1893 thanks for helping review this PR. If you want to help review more Swift Cliente PRs are you welcome 👍
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.
Hey @4brunu thx will gladly do so :)