diff --git a/modules/openapi-generator/src/main/resources/swift6/Cartfile.mustache b/modules/openapi-generator/src/main/resources/swift6/Cartfile.mustache index 7b6736ea7607..2a6ed435d5e5 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Cartfile.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Cartfile.mustache @@ -1,3 +1,5 @@ -{{#useAlamofire}}github "Alamofire/Alamofire" ~> 5.9{{/useAlamofire}}{{#usePromiseKit}} +{{#useAlamofire}} +# 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. +github "Alamofire/Alamofire" = 5.9.1{{/useAlamofire}}{{#usePromiseKit}} github "mxcl/PromiseKit" ~> 8.1{{/usePromiseKit}}{{#useRxSwift}} -github "ReactiveX/RxSwift" ~> 6.7{{/useRxSwift}} +github "ReactiveX/RxSwift" ~> 6.8{{/useRxSwift}} diff --git a/modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache b/modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache index 4a33ac25b066..811037e75369 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache @@ -25,13 +25,14 @@ let package = Package( dependencies: [ // Dependencies declare other packages that this package depends on. {{#useAlamofire}} - .package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "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. + .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.9.1"), {{/useAlamofire}} {{#usePromiseKit}} .package(url: "https://github.com/mxcl/PromiseKit", .upToNextMajor(from: "8.1.2")), {{/usePromiseKit}} {{#useRxSwift}} - .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.7.1")), + .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.8.0")), {{/useRxSwift}} {{#useVapor}} .package(url: "https://github.com/vapor/vapor", from: "4.0.0") diff --git a/modules/openapi-generator/src/main/resources/swift6/Podspec.mustache b/modules/openapi-generator/src/main/resources/swift6/Podspec.mustache index cc92d5c406a0..32f732d04c2e 100644 --- a/modules/openapi-generator/src/main/resources/swift6/Podspec.mustache +++ b/modules/openapi-generator/src/main/resources/swift6/Podspec.mustache @@ -27,12 +27,13 @@ Pod::Spec.new do |s| {{/podDocumentationURL}} s.source_files = '{{swiftPackagePath}}{{^swiftPackagePath}}{{#useSPMFileStructure}}Sources/{{projectName}}{{/useSPMFileStructure}}{{^useSPMFileStructure}}{{projectName}}/Classes{{/useSPMFileStructure}}{{/swiftPackagePath}}/**/*.swift' {{#useAlamofire}} - s.dependency 'Alamofire', '~> 5.9' + # 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. + s.dependency 'Alamofire', '5.9.1' {{/useAlamofire}} {{#usePromiseKit}} s.dependency 'PromiseKit/CorePromise', '~> 8.1' {{/usePromiseKit}} {{#useRxSwift}} - s.dependency 'RxSwift', '~> 6.7' + s.dependency 'RxSwift', '~> 6.8' {{/useRxSwift}} end diff --git a/samples/client/petstore/swift6/alamofireLibrary/Cartfile b/samples/client/petstore/swift6/alamofireLibrary/Cartfile index 2aef60d42aed..37690feb8b30 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Cartfile +++ b/samples/client/petstore/swift6/alamofireLibrary/Cartfile @@ -1 +1,2 @@ -github "Alamofire/Alamofire" ~> 5.9 +# 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. +github "Alamofire/Alamofire" = 5.9.1 diff --git a/samples/client/petstore/swift6/alamofireLibrary/Package.resolved b/samples/client/petstore/swift6/alamofireLibrary/Package.resolved index 6a8f55be4c4c..423182cd6818 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Package.resolved +++ b/samples/client/petstore/swift6/alamofireLibrary/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "6fb5b6bfc406365339fcc9d8236adab4f0b7ee38fc666a0f00b4b3b75beb7900", + "originHash" : "82fa799fdb0b54d09f6eef7da70838721a3b0d69ea8499c89924e55e07e47110", "pins" : [ { "identity" : "alamofire", diff --git a/samples/client/petstore/swift6/alamofireLibrary/Package.swift b/samples/client/petstore/swift6/alamofireLibrary/Package.swift index 05d92a11b451..96a56d49ac0d 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/Package.swift +++ b/samples/client/petstore/swift6/alamofireLibrary/Package.swift @@ -19,7 +19,8 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "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. + .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.9.1"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec index 4b5585be60cb..42982ae8f384 100644 --- a/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/alamofireLibrary/PetstoreClient.podspec @@ -11,5 +11,6 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' s.source_files = 'Sources/PetstoreClient/**/*.swift' - s.dependency 'Alamofire', '~> 5.9' + # 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. + s.dependency 'Alamofire', '5.9.1' end diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Cartfile b/samples/client/petstore/swift6/apiNonStaticMethod/Cartfile index b75ded845832..ae4acb9c5fc5 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Cartfile +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Cartfile @@ -1,3 +1,4 @@ -github "Alamofire/Alamofire" ~> 5.9 +# 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. +github "Alamofire/Alamofire" = 5.9.1 github "mxcl/PromiseKit" ~> 8.1 -github "ReactiveX/RxSwift" ~> 6.7 +github "ReactiveX/RxSwift" ~> 6.8 diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Package.resolved b/samples/client/petstore/swift6/apiNonStaticMethod/Package.resolved index eadb875907e1..34a66b36fab7 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Package.resolved +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "b14c4fe6a7263c50050b60f25c3f28d6b22d415d0c780c4d5a3494c6c0218ccd", + "originHash" : "766b7b8894983c692454ee57aad3d618580bf90078cad51008d129ddf41ff945", "pins" : [ { "identity" : "alamofire", @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/ReactiveX/RxSwift", "state" : { - "revision" : "b06a8c8596e4c3e8e7788e08e720e3248563ce6a", - "version" : "6.7.1" + "revision" : "c7c7d2cf50a3211fe2843f76869c698e4e417930", + "version" : "6.8.0" } } ], diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift b/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift index 2d80589c15e3..16458649fe43 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift +++ b/samples/client/petstore/swift6/apiNonStaticMethod/Package.swift @@ -19,9 +19,10 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "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. + .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.9.1"), .package(url: "https://github.com/mxcl/PromiseKit", .upToNextMajor(from: "8.1.2")), - .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.7.1")), + .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.8.0")), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec index 856687676df0..f69d9ae39c98 100644 --- a/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/apiNonStaticMethod/PetstoreClient.podspec @@ -11,7 +11,8 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' s.source_files = 'Sources/PetstoreClient/**/*.swift' - s.dependency 'Alamofire', '~> 5.9' + # 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. + s.dependency 'Alamofire', '5.9.1' s.dependency 'PromiseKit/CorePromise', '~> 8.1' - s.dependency 'RxSwift', '~> 6.7' + s.dependency 'RxSwift', '~> 6.8' end diff --git a/samples/client/petstore/swift6/rxswiftLibrary/Cartfile b/samples/client/petstore/swift6/rxswiftLibrary/Cartfile index 90e87c59faf0..08ea7f87690e 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/Cartfile +++ b/samples/client/petstore/swift6/rxswiftLibrary/Cartfile @@ -1,2 +1,2 @@ -github "ReactiveX/RxSwift" ~> 6.7 +github "ReactiveX/RxSwift" ~> 6.8 diff --git a/samples/client/petstore/swift6/rxswiftLibrary/Package.swift b/samples/client/petstore/swift6/rxswiftLibrary/Package.swift index cfa0a32107db..378f1f5691f3 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/Package.swift +++ b/samples/client/petstore/swift6/rxswiftLibrary/Package.swift @@ -19,7 +19,7 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.7.1")), + .package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.8.0")), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient.podspec b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient.podspec index 43734a05f832..3731fc0afde1 100644 --- a/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient.podspec +++ b/samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient.podspec @@ -11,5 +11,5 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/openapitools/openapi-generator' s.summary = 'PetstoreClient' s.source_files = 'PetstoreClient/Classes/**/*.swift' - s.dependency 'RxSwift', '~> 6.7' + s.dependency 'RxSwift', '~> 6.8' end