Skip to content

Commit 63fe122

Browse files
4brunu4brunu
committed
Merge branch 'master' into feature/swift6-concurrent
# Conflicts: # modules/openapi-generator/src/main/resources/swift6/libraries/urlsession/URLSessionImplementations.mustache # samples/client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/URLSessionImplementations.swift # samples/client/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/URLSessionImplementations.swift
2 parents fd94fca + acb80ba commit 63fe122

32 files changed

Lines changed: 124 additions & 124 deletions

File tree

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ for this project used jakarta.validation-api -->
220220
<swagger-core-version>1.5.22</swagger-core-version>
221221
<jetty-version>9.2.9.v20150224</jetty-version>
222222
<junit-version>4.13.2</junit-version>
223-
<logback-version>1.5.19</logback-version>
223+
<logback-version>1.5.25</logback-version>
224224
{{#useBeanValidation}}
225225
<beanvalidation-version>2.0.2</beanvalidation-version>
226226
{{/useBeanValidation}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ for this project used jakarta.validation-api -->
342342
{{/generateSpringApplication}}
343343
{{^generateSpringBootApplication}}
344344
<junit-version>4.13.2</junit-version>
345-
<logback-version>1.5.19</logback-version>
345+
<logback-version>1.5.25</logback-version>
346346
{{/generateSpringBootApplication}}
347347
<cxf-version>3.5.9</cxf-version>
348348
<jackson-jaxrs-version>2.17.1</jackson-jaxrs-version>

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ for this project used jakarta.validation-api -->
255255
{{/swagger2AnnotationLibrary}}
256256
<jetty-version>9.2.9.v20150224</jetty-version>
257257
<junit-version>4.13.2</junit-version>
258-
<logback-version>1.5.19</logback-version>
258+
<logback-version>1.5.25</logback-version>
259259
{{#useBeanValidation}}
260260
<beanvalidation-version>2.0.2</beanvalidation-version>
261261
{{/useBeanValidation}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ for this project used jakarta.validation-api -->
311311
{{/swagger2AnnotationLibrary}}
312312
<jetty-version>9.2.9.v20150224</jetty-version>
313313
<junit-version>4.13.2</junit-version>
314-
<logback-version>1.5.19</logback-version>
314+
<logback-version>1.5.25</logback-version>
315315
{{#useBeanValidation}}
316316
<beanvalidation-version>2.0.2</beanvalidation-version>
317317
{{/useBeanValidation}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/libraries/jersey3/pom.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
<jersey3-version>3.1.3</jersey3-version>
223223
<jackson-version>2.17.1</jackson-version>
224224
<junit-version>4.13.2</junit-version>
225-
<logback-version>1.5.19</logback-version>
225+
<logback-version>1.5.25</logback-version>
226226
<servlet-api-version>5.0.0</servlet-api-version>
227227
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
228228
</properties>

‎modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ for this project used jakarta.validation-api -->
222222
<jersey2-version>2.35</jersey2-version>
223223
<jackson-version>2.17.1</jackson-version>
224224
<junit-version>4.13.2</junit-version>
225-
<logback-version>1.5.19</logback-version>
225+
<logback-version>1.5.25</logback-version>
226226
<servlet-api-version>4.0.4</servlet-api-version>
227227
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
228228
</properties>

‎modules/openapi-generator/src/main/resources/swift6/libraries/urlsession/URLSessionImplementations.mustache‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
242242
}
243243
}
244244

245-
fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, httpResponse: HTTPURLResponse, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) {
245+
fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, httpResponse: HTTPURLResponse, error: Error?, completion: @Sendable @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) {
246246
247247
switch T.self {
248248
case is Void.Type:
@@ -320,7 +320,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
320320
}
321321

322322
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class URLSessionDecodableRequestBuilder<T: Decodable & Sendable>: URLSessionRequestBuilder<T>, @unchecked Sendable {
323-
override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, httpResponse: HTTPURLResponse, error: Error?, completion: @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) {
323+
override fileprivate func processRequestResponse(urlRequest: URLRequest, data: Data?, httpResponse: HTTPURLResponse, error: Error?, completion: @Sendable @escaping (_ result: Swift.Result<Response<T>, ErrorResponse>) -> Void) {
324324
325325
switch T.self {
326326
case is String.Type:
@@ -398,7 +398,7 @@ fileprivate class URLSessionRequestBuilderConfiguration: @unchecked Sendable {
398398
}
399399

400400
fileprivate final class SessionDelegate: NSObject, URLSessionTaskDelegate {
401-
func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
401+
func urlSession(_ session: URLSession, task: URLSessionTask, didReceive challenge: URLAuthenticationChallenge, completionHandler: @Sendable @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
402402
403403
var disposition: URLSession.AuthChallengeDisposition = .performDefaultHandling
404404
@@ -458,7 +458,7 @@ private class FormDataEncoding: ParameterEncoding {
458458
459459
let contentTypeForFormPart: (_ fileURL: URL) -> String?
460460
461-
init(contentTypeForFormPart: @escaping (_ fileURL: URL) -> String?) {
461+
init(contentTypeForFormPart: @Sendable @escaping (_ fileURL: URL) -> String?) {
462462
self.contentTypeForFormPart = contentTypeForFormPart
463463
}
464464

@@ -712,19 +712,19 @@ extension JSONDataEncoding: ParameterEncoding {}
712712
}
713713

714714
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} protocol OpenAPIInterceptor {
715-
func intercept<T>(urlRequest: URLRequest, urlSession: URLSessionProtocol, requestBuilder: RequestBuilder<T>, completion: @escaping (Result<URLRequest, Error>) -> Void)
715+
func intercept<T>(urlRequest: URLRequest, urlSession: URLSessionProtocol, requestBuilder: RequestBuilder<T>, completion: @Sendable @escaping (Result<URLRequest, Error>) -> Void)
716716
717-
func retry<T>(urlRequest: URLRequest, urlSession: URLSessionProtocol, requestBuilder: RequestBuilder<T>, data: Data?, response: URLResponse?, error: Error, completion: @escaping (OpenAPIInterceptorRetry) -> Void)
717+
func retry<T>(urlRequest: URLRequest, urlSession: URLSessionProtocol, requestBuilder: RequestBuilder<T>, data: Data?, response: URLResponse?, error: Error, completion: @Sendable @escaping (OpenAPIInterceptorRetry) -> Void)
718718
}
719719

720720
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} class DefaultOpenAPIInterceptor: OpenAPIInterceptor {
721721
public init() {}
722722

723-
public func intercept<T>(urlRequest: URLRequest, urlSession: URLSessionProtocol, requestBuilder: RequestBuilder<T>, completion: @escaping (Result<URLRequest, any Error>) -> Void) {
723+
public func intercept<T>(urlRequest: URLRequest, urlSession: URLSessionProtocol, requestBuilder: RequestBuilder<T>, completion: @Sendable @escaping (Result<URLRequest, any Error>) -> Void) {
724724
completion(.success(urlRequest))
725725
}
726726

727-
public func retry<T>(urlRequest: URLRequest, urlSession: URLSessionProtocol, requestBuilder: RequestBuilder<T>, data: Data?, response: URLResponse?, error: Error, completion: @escaping (OpenAPIInterceptorRetry) -> Void) {
727+
public func retry<T>(urlRequest: URLRequest, urlSession: URLSessionProtocol, requestBuilder: RequestBuilder<T>, data: Data?, response: URLResponse?, error: Error, completion: @Sendable @escaping (OpenAPIInterceptorRetry) -> Void) {
728728
completion(.dontRetry)
729729
}
730730
}

‎samples/client/petstore/javascript-flowtyped/package-lock.json‎

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

‎samples/client/petstore/javascript-flowtyped/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@babel/preset-flow": "^7.0.0",
3030
"babel-preset-react-app": "^7.0.0",
3131
"flow-copy-source": "^2.0.0",
32-
"lodash": ">=4.17.19",
32+
"lodash": ">=4.17.23",
3333
"rimraf": "^2.6.2"
3434
}
3535
}

‎samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ for this project used jakarta.validation-api -->
197197
<swagger-core-version>1.6.6</swagger-core-version>
198198
<jetty-version>9.2.9.v20150224</jetty-version>
199199
<junit-version>4.13.2</junit-version>
200-
<logback-version>1.5.19</logback-version>
200+
<logback-version>1.5.25</logback-version>
201201
<cxf-version>3.5.9</cxf-version>
202202
<jackson-jaxrs-version>2.17.1</jackson-jaxrs-version>
203203
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>

0 commit comments

Comments
 (0)