loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[swift5] less restrictive alamofire dependency resolution (#13977)

Browse Source 
* modify Alamofire version in podspec

* modify Alamofire version in Package.swift

* also pin optimistically in Cartfile

* optimistically resolve all other dependencies to next major version
This commit is contained in:
Jonas Reichert
2022-11-10 18:27:24 +01:00
committed by GitHub
parent 7ad9f835ff
commit f1b8190b19
49 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openapi-generator/src/main/resources/swift5/Cartfile.mustache vendored
View File

@@ -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{{#useAlamofire}}
github "Alamofire/Alamofire" ~> 5.4{{/useAlamofire}}{{#usePromiseKit}}
github "mxcl/PromiseKit" ~> 6.15{{/usePromiseKit}}{{#useRxSwift}}
github "ReactiveX/RxSwift" ~> 6.2{{/useRxSwift}}

8
modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache vendored
View File

@@ -31,15 +31,15 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
{{#useAlamofire}}
.package(url: "https://github.com/Alamofire/Alamofire", from: "5.4.3"),
.package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "5.4.3")),
{{/useAlamofire}}
{{#usePromiseKit}}
.package(url: "https://github.com/mxcl/PromiseKit", from: "6.15.3"),
.package(url: "https://github.com/mxcl/PromiseKit", .upToNextMajor(from: "6.15.3")),
{{/usePromiseKit}}
{{#useRxSwift}}
.package(url: "https://github.com/ReactiveX/RxSwift", from: "6.2.0"),
.package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.2.0")),
{{/useRxSwift}}
{{#useVapor}}
.package(url: "https://github.com/vapor/vapor", from: "4.0.0")

8
modules/openapi-generator/src/main/resources/swift5/Podspec.mustache vendored
View File

@@ -33,14 +33,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'
{{#useAlamofire}}
s.dependency 'Alamofire', '~> 5.4.3'
s.dependency 'Alamofire', '~> 5.4'
{{/useAlamofire}}
{{#usePromiseKit}}
s.dependency 'PromiseKit/CorePromise', '~> 6.15.3'
s.dependency 'PromiseKit/CorePromise', '~> 6.15'
{{/usePromiseKit}}
{{#useRxSwift}}
s.dependency 'RxSwift', '~> 6.2.0'
s.dependency 'RxSwift', '~> 6.2'
{{/useRxSwift}}
end

4
samples/client/petstore/swift5/alamofireLibrary/Cartfile
View File

@@ -1,2 +1,2 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Alamofire/Alamofire" ~> 5.4.3
github "Flight-School/AnyCodable" ~> 0.6
github "Alamofire/Alamofire" ~> 5.4

4
samples/client/petstore/swift5/alamofireLibrary/Package.swift
View File

@@ -19,8 +19,8 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Alamofire/Alamofire", from: "5.4.3"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
.package(url: "https://github.com/Alamofire/Alamofire", .upToNextMajor(from: "5.4.3")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

4
samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.podspec
View File

@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
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'
s.dependency 'Alamofire', '~> 5.4'
end

2
samples/client/petstore/swift5/asyncAwaitLibrary/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/asyncAwaitLibrary/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

2
samples/client/petstore/swift5/combineLibrary/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/combineLibrary/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/combineLibrary/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

2
samples/client/petstore/swift5/default/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/default/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/default/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

2
samples/client/petstore/swift5/deprecated/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/deprecated/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/deprecated/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

2
samples/client/petstore/swift5/frozenEnums/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/frozenEnums/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/frozenEnums/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

2
samples/client/petstore/swift5/nonPublicApi/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/nonPublicApi/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/nonPublicApi/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

2
samples/client/petstore/swift5/objcCompatible/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/objcCompatible/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/objcCompatible/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

2
samples/client/petstore/swift5/oneOf/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/oneOf/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/oneOf/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

4
samples/client/petstore/swift5/promisekitLibrary/Cartfile
View File

@@ -1,2 +1,2 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "mxcl/PromiseKit" ~> 6.15.3
github "Flight-School/AnyCodable" ~> 0.6
github "mxcl/PromiseKit" ~> 6.15

4
samples/client/petstore/swift5/promisekitLibrary/Package.swift
View File

@@ -19,8 +19,8 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/mxcl/PromiseKit", from: "6.15.3"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
.package(url: "https://github.com/mxcl/PromiseKit", .upToNextMajor(from: "6.15.3")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

4
samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.podspec
View File

@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
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 'PromiseKit/CorePromise', '~> 6.15.3'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
s.dependency 'PromiseKit/CorePromise', '~> 6.15'
end

2
samples/client/petstore/swift5/readonlyProperties/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/readonlyProperties/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/readonlyProperties/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

2
samples/client/petstore/swift5/resultLibrary/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/resultLibrary/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/resultLibrary/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

4
samples/client/petstore/swift5/rxswiftLibrary/Cartfile
View File

@@ -1,2 +1,2 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "ReactiveX/RxSwift" ~> 6.2.0
github "Flight-School/AnyCodable" ~> 0.6
github "ReactiveX/RxSwift" ~> 6.2

4
samples/client/petstore/swift5/rxswiftLibrary/Package.swift
View File

@@ -19,8 +19,8 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/ReactiveX/RxSwift", from: "6.2.0"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
.package(url: "https://github.com/ReactiveX/RxSwift", .upToNextMajor(from: "6.2.0")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

4
samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.podspec
View File

@@ -11,6 +11,6 @@ Pod::Spec.new do |s|
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 'RxSwift', '~> 6.2.0'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
s.dependency 'RxSwift', '~> 6.2'
end

2
samples/client/petstore/swift5/urlsessionLibrary/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/urlsessionLibrary/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient.podspec
View File

@@ -11,5 +11,5 @@ Pod::Spec.new do |s|
s.homepage = 'https://github.com/openapitools/openapi-generator'
s.summary = 'PetstoreClient'
s.source_files = 'Sources/PetstoreClient/**/*.swift'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end

2
samples/client/petstore/swift5/vaporLibrary/Package.swift
View File

@@ -16,7 +16,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
.package(url: "https://github.com/vapor/vapor", from: "4.0.0")
],
targets: [

2
samples/client/petstore/swift5/x-swift-hashable/Cartfile
View File

@@ -1 +1 @@
github "Flight-School/AnyCodable" ~> 0.6.1
github "Flight-School/AnyCodable" ~> 0.6

2
samples/client/petstore/swift5/x-swift-hashable/Package.swift
View File

@@ -19,7 +19,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.1"),
.package(url: "https://github.com/Flight-School/AnyCodable", .upToNextMajor(from: "0.6.1")),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

2
samples/client/petstore/swift5/x-swift-hashable/PetstoreClient.podspec
View File

@@ -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 'AnyCodable-FlightSchool', '~> 0.6.1'
s.dependency 'AnyCodable-FlightSchool', '~> 0.6'
end