Skip to content

Commit 266193f

Browse files
4brunu4brunu
authored
[swift6] update RXSwift version and pin Alamofire version (#19857)
1 parent cfdb00a commit 266193f

File tree

14 files changed

+32
-22
lines changed

14 files changed

+32
-22
lines changed

‎modules/openapi-generator/src/main/resources/swift6/Cartfile.mustache‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
{{#useAlamofire}}github "Alamofire/Alamofire" ~> 5.9{{/useAlamofire}}{{#usePromiseKit}}
1+
{{#useAlamofire}}
2+
# TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes.
3+
github "Alamofire/Alamofire" = 5.9.1{{/useAlamofire}}{{#usePromiseKit}}
24
github "mxcl/PromiseKit" ~> 8.1{{/usePromiseKit}}{{#useRxSwift}}
3-
github "ReactiveX/RxSwift" ~> 6.7{{/useRxSwift}}
5+
github "ReactiveX/RxSwift" ~> 6.8{{/useRxSwift}}

‎modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ let package = Package(
2525
dependencies: [
2626
// Dependencies declare other packages that this package depends on.
2727
{{#useAlamofire}}
28-
.package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "5.9.1")),
28+
// TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes.
29+
.package(url: "https://github.com/Alamofire/Alamofire", exact: "5.9.1"),
2930
{{/useAlamofire}}
3031
{{#usePromiseKit}}
3132
.package(url: "https://github.com/mxcl/PromiseKit", .upToNextMajor(from: "8.1.2")),
3233
{{/usePromiseKit}}
3334
{{#useRxSwift}}
34-
.package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.7.1")),
35+
.package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.8.0")),
3536
{{/useRxSwift}}
3637
{{#useVapor}}
3738
.package(url: "https://github.com/vapor/vapor", from: "4.0.0")

‎modules/openapi-generator/src/main/resources/swift6/Podspec.mustache‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ Pod::Spec.new do |s|
2727
{{/podDocumentationURL}}
2828
s.source_files = '{{swiftPackagePath}}{{^swiftPackagePath}}{{#useSPMFileStructure}}Sources/{{projectName}}{{/useSPMFileStructure}}{{^useSPMFileStructure}}{{projectName}}/Classes{{/useSPMFileStructure}}{{/swiftPackagePath}}/**/*.swift'
2929
{{#useAlamofire}}
30-
s.dependency 'Alamofire', '~> 5.9'
30+
# TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes.
31+
s.dependency 'Alamofire', '5.9.1'
3132
{{/useAlamofire}}
3233
{{#usePromiseKit}}
3334
s.dependency 'PromiseKit/CorePromise', '~> 8.1'
3435
{{/usePromiseKit}}
3536
{{#useRxSwift}}
36-
s.dependency 'RxSwift', '~> 6.7'
37+
s.dependency 'RxSwift', '~> 6.8'
3738
{{/useRxSwift}}
3839
end

‎samples/client/petstore/swift6/alamofireLibrary/Cartfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
github "Alamofire/Alamofire" ~> 5.9
1+
# TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes.
2+
github "Alamofire/Alamofire" = 5.9.1

‎samples/client/petstore/swift6/alamofireLibrary/Package.resolved‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/client/petstore/swift6/alamofireLibrary/Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ let package = Package(
1919
],
2020
dependencies: [
2121
// Dependencies declare other packages that this package depends on.
22-
.package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "5.9.1")),
22+
// TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes.
23+
.package(url: "https://github.com/Alamofire/Alamofire", exact: "5.9.1"),
2324
],
2425
targets: [
2526
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

‎samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ Pod::Spec.new do |s|
1111
s.homepage = 'https://github.com/openapitools/openapi-generator'
1212
s.summary = 'PetstoreClient'
1313
s.source_files = 'Sources/PetstoreClient/**/*.swift'
14-
s.dependency 'Alamofire', '~> 5.9'
14+
# TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes.
15+
s.dependency 'Alamofire', '5.9.1'
1516
end

‎samples/client/petstore/swift6/apiNonStaticMethod/Cartfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
github "Alamofire/Alamofire" ~> 5.9
1+
# TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes.
2+
github "Alamofire/Alamofire" = 5.9.1
23
github "mxcl/PromiseKit" ~> 8.1
3-
github "ReactiveX/RxSwift" ~> 6.7
4+
github "ReactiveX/RxSwift" ~> 6.8

‎samples/client/petstore/swift6/apiNonStaticMethod/Package.resolved‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/client/petstore/swift6/apiNonStaticMethod/Package.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ let package = Package(
1919
],
2020
dependencies: [
2121
// Dependencies declare other packages that this package depends on.
22-
.package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "5.9.1")),
22+
// TODO: Alamofire versions 5.10.0 and above are not currently supported. If you need a newer version, please consider submitting a Pull Request with the required changes.
23+
.package(url: "https://github.com/Alamofire/Alamofire", exact: "5.9.1"),
2324
.package(url: "https://github.com/mxcl/PromiseKit", .upToNextMajor(from: "8.1.2")),
24-
.package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.7.1")),
25+
.package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.8.0")),
2526
],
2627
targets: [
2728
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

0 commit comments

Comments
 (0)