Merge branch 'main' into release/4_0

mattpolzin · Nov 1, 2024 · 446a10a · 446a10a
2 parents 3a2e80e + 5b5ee49
commit 446a10a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Sources/OpenAPIKit/Document/Document.swift b/Sources/OpenAPIKit/Document/Document.swift
@@ -425,6 +425,7 @@ extension OpenAPI.Document {
     /// OpenAPIKit to a certain extent.
     public enum Version: String, Codable {
         case v3_1_0 = "3.1.0"
+        case v3_1_1 = "3.1.1"
     }
 }
 

diff --git a/Sources/OpenAPIKit30/Document/Document.swift b/Sources/OpenAPIKit30/Document/Document.swift
@@ -413,6 +413,7 @@ extension OpenAPI.Document {
         case v3_0_1 = "3.0.1"
         case v3_0_2 = "3.0.2"
         case v3_0_3 = "3.0.3"
+        case v3_0_4 = "3.0.4"
     }
 }
 

diff --git a/Sources/OpenAPIKitCompat/Compat30To31.swift b/Sources/OpenAPIKitCompat/Compat30To31.swift
@@ -10,10 +10,7 @@ import OpenAPIKit30
 
 public extension OpenAPIKit30.OpenAPI.Document {
     func `convert`(to version: OpenAPIKit.OpenAPI.Document.Version) -> OpenAPIKit.OpenAPI.Document {
-        switch version {
-        case .v3_1_0:
-            return self.to31()
-        }
+        return self.to31(version: version)
     }
 }
 
@@ -22,10 +19,10 @@ private protocol To31 {
     func to31() -> Destination
 }
 
-extension OpenAPIKit30.OpenAPI.Document: To31 {
-    fileprivate func to31() -> OpenAPIKit.OpenAPI.Document {
+extension OpenAPIKit30.OpenAPI.Document {
+    fileprivate func to31(version: OpenAPIKit.OpenAPI.Document.Version = .v3_1_0) -> OpenAPIKit.OpenAPI.Document {
         OpenAPIKit.OpenAPI.Document(
-            openAPIVersion: .v3_1_0,
+            openAPIVersion: version,
             info: info.to31(),
             servers: servers.map { $0.to31() },
             paths: paths.mapValues { eitherRefTo31($0) },