Skip to content

Commit 95cc707

Browse files
4brunu4brunu
committed
Merge branch 'master' into feature/vapor
# Conflicts: # samples/client/petstore/swift6/vaporLibrary/Package.resolved
2 parents 10f43f6 + d19f0cd commit 95cc707

222 files changed

Lines changed: 1003 additions & 544 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,20 +121,17 @@ import Alamofire{{/useAlamofire}}
121121
{{#useAsyncAwait}}
122122
#if compiler(>=6.2)
123123
@concurrent
124-
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
125124
@discardableResult
126125
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func execute() async throws(ErrorResponse) -> Response<T> {
127126
try await _execute()
128127
}
129128
#else
130-
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
131129
@discardableResult
132130
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func execute() async throws(ErrorResponse) -> Response<T> {
133131
try await _execute()
134132
}
135133
#endif
136134

137-
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
138135
@discardableResult
139136
private func _execute() async throws(ErrorResponse) -> Response<T> {
140137
do {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ let package = Package(
99
.macOS(.v10_15),
1010
{{/useVapor}}
1111
{{^useVapor}}
12-
.iOS(.v12),
13-
.macOS(.v10_13),
14-
.tvOS(.v12),
15-
.watchOS(.v4),
12+
.iOS(.v13),
13+
.macOS(.v10_15),
14+
.tvOS(.v13),
15+
.watchOS(.v6),
1616
{{/useVapor}}
1717
],
1818
products: [

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Pod::Spec.new do |s|
22
s.name = '{{projectName}}'{{#projectDescription}}
33
s.summary = '{{.}}'{{/projectDescription}}
4-
s.ios.deployment_target = '12.0'
5-
s.osx.deployment_target = '10.13'
6-
s.tvos.deployment_target = '12.0'
7-
s.watchos.deployment_target = '4.0'
4+
s.ios.deployment_target = '13.0'
5+
s.osx.deployment_target = '10.15'
6+
s.tvos.deployment_target = '13.0'
7+
s.watchos.deployment_target = '6.0'
88
s.version = '{{podVersion}}{{^podVersion}}{{#apiInfo}}{{version}}{{/apiInfo}}{{^apiInfo}}}0.0.1{{/apiInfo}}{{/podVersion}}'
99
s.source = {{#podSource}}{{& podSource}}{{/podSource}}{{^podSource}}{ :git => 'git@github.com:OpenAPITools/openapi-generator.git', :tag => 'v{{#apiInfo}}{{version}}{{/apiInfo}}{{^apiInfo}}}0.0.1{{/apiInfo}}' }{{/podSource}}
1010
{{#podAuthors}}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ extension {{projectName}}API {
165165
{{#isDeprecated}}
166166
@available(*, deprecated, message: "This operation is deprecated.")
167167
{{/isDeprecated}}
168-
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
169168
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} {{#apiStaticMethod}}class {{/apiStaticMethod}}func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#apiStaticMethod}}{{#hasParams}}, {{/hasParams}}apiConfiguration: {{projectName}}APIConfiguration = {{projectName}}APIConfiguration.shared{{/apiStaticMethod}}) -> AnyPublisher<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}, Error> {
170169
let requestBuilder = {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#apiStaticMethod}}{{#hasParams}}, {{/hasParams}}apiConfiguration: apiConfiguration{{/apiStaticMethod}})
171170
let requestTask = requestBuilder.requestTask
@@ -210,7 +209,6 @@ extension {{projectName}}API {
210209
{{#isDeprecated}}
211210
@available(*, deprecated, message: "This operation is deprecated.")
212211
{{/isDeprecated}}
213-
@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
214212
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} {{#apiStaticMethod}}class {{/apiStaticMethod}}func {{operationId}}({{#allParams}}{{paramName}}: {{#isEnum}}{{#isContainer}}[{{enumName}}_{{operationId}}]{{/isContainer}}{{^isContainer}}{{enumName}}_{{operationId}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}? = nil{{/required}}{{^-last}}, {{/-last}}{{/allParams}}{{#apiStaticMethod}}{{#hasParams}}, {{/hasParams}}apiConfiguration: {{projectName}}APIConfiguration = {{projectName}}APIConfiguration.shared{{/apiStaticMethod}}) async throws(ErrorResponse){{#returnType}} -> {{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{/returnType}} {
215213
return try await {{operationId}}WithRequestBuilder({{#allParams}}{{paramName}}: {{paramName}}{{^-last}}, {{/-last}}{{/allParams}}{{#apiStaticMethod}}{{#hasParams}}, {{/hasParams}}apiConfiguration: apiConfiguration{{/apiStaticMethod}}).execute().body
216214
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ extension {{projectName}}API {
2525
{{#swiftUseApiNamespace}}
2626
}
2727
{{/swiftUseApiNamespace}}{{#models}}{{#model}}{{#vendorExtensions.x-swift-identifiable}}
28-
@available(iOS 13, tvOS 13, watchOS 6, macOS 10.15, *)
2928
extension {{#swiftUseApiNamespace}}{{projectName}}API.{{/swiftUseApiNamespace}}{{{classname}}}: Identifiable {}
3029
{{/vendorExtensions.x-swift-identifiable}}{{/model}}{{/models}}

‎samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Api/IApi.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* Example
3+
*
4+
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
5+
*
6+
* The version of the OpenAPI document: 1.0.0
7+
* Generated by: https://github.com/openapitools/openapi-generator.git
8+
*/
9+
110
using System.Net.Http;
211

312
namespace Org.OpenAPITools.Api
@@ -12,4 +21,4 @@ public interface IApi
1221
/// </summary>
1322
HttpClient HttpClient { get; }
1423
}
15-
}
24+
}

‎samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/ApiFactory.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* Example
3+
*
4+
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
5+
*
6+
* The version of the OpenAPI document: 1.0.0
7+
* Generated by: https://github.com/openapitools/openapi-generator.git
8+
*/
9+
110
using System;
211
using Microsoft.Extensions.DependencyInjection;
312
using Org.OpenAPITools.Api;

‎samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/ApiResponseEventArgs.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* Example
3+
*
4+
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
5+
*
6+
* The version of the OpenAPI document: 1.0.0
7+
* Generated by: https://github.com/openapitools/openapi-generator.git
8+
*/
9+
110
using System;
211

312
namespace Org.OpenAPITools.Client

‎samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/CookieContainer.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
// <auto-generated>
2+
/*
3+
* Example
4+
*
5+
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
6+
*
7+
* The version of the OpenAPI document: 1.0.0
8+
* Generated by: https://github.com/openapitools/openapi-generator.git
9+
*/
210

311
#nullable enable
412

@@ -17,4 +25,4 @@ public sealed class CookieContainer
1725
/// </summary>
1826
public System.Net.CookieContainer Value { get; } = new System.Net.CookieContainer();
1927
}
20-
}
28+
}

‎samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/ExceptionEventArgs.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* Example
3+
*
4+
* No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
5+
*
6+
* The version of the OpenAPI document: 1.0.0
7+
* Generated by: https://github.com/openapitools/openapi-generator.git
8+
*/
9+
110
using System;
211

312
namespace Org.OpenAPITools.Client

0 commit comments

Comments
 (0)