Update to 1.2.0

Author: Dreksh

MODULE.bazel

@@ -1,5 +1,5 @@
 # THIS IS AUTO-GENERATED BY bazel run //:update
-module(name = "swift-openapi-generator", version = "1.0.0-alpha.1")
+module(name = "swift-openapi-generator", version = "1.2.0")
 
 load_code = use_extension("//:extensions.bzl", "load_code")
 use_repo(
@@ -27,6 +27,7 @@ use_repo(
     "swiftpkg_swift_algorithms",
     "swiftpkg_swift_argument_parser",
     "swiftpkg_swift_docc_plugin",
+    "swiftpkg_swift_http_types",
     "swiftpkg_swift_openapi_runtime",
     "swiftpkg_yams",
 )

README.md

@@ -26,6 +26,8 @@ archive_override(
 )
 ```
 
+Check the release notes for the updated values to put into the snippet above.
+
 ### Using the Rule
 
 In the Bazel package where you want to generate the Swift code from OpenAPI specs, add these lines:

extensions.bzl

@@ -4,9 +4,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 def _load_code_impl(module_ctx):
     http_archive(
         name = "swift-openapi-generator-code",
-        url = "https://github.com/apple/swift-openapi-generator/archive/refs/tags/1.0.0-alpha.1.tar.gz",
-        sha256 = "dc79d7779357f387a94f59e55a64cb041c13828a6318b99931f154122f66d600",
-        strip_prefix = "swift-openapi-generator-1.0.0-alpha.1",
+        url = "https://github.com/apple/swift-openapi-generator/archive/refs/tags/1.2.0.tar.gz",
+        sha256 = "1eb0e97d177a5156ada912feec264b5848064c3d60ded1e680ef65c337d84292",
+        strip_prefix = "swift-openapi-generator-1.2.0",
 
         patches = ["//:internal/swift-openapi-generator.patch"], # Add pre-calculated bazel files to the repo
         patch_args = ["-p1"],                                    # Using Git-diff requires stripping the first path

internal/swift-openapi-generator.patch

@@ -40,150 +40,6 @@ index 0000000..690b968
 +    name = "create_build_files",
 +    gazelle = ":gazelle_bin",
 +)
-diff --git a/Examples/GreetingService/Sources/GreetingService/BUILD.bazel b/Examples/GreetingService/Sources/GreetingService/BUILD.bazel
-new file mode 100644
-index 0000000..1367c56
---- /dev/null
-+++ b/Examples/GreetingService/Sources/GreetingService/BUILD.bazel
-@@ -0,0 +1,9 @@
-+load("@rules_swift//swift:swift.bzl", "swift_binary")
-+
-+swift_binary(
-+    name = "GreetingService",
-+    srcs = ["GreetingService.swift"],
-+    module_name = "GreetingService",
-+    visibility = ["//visibility:public"],
-+    deps = ["@swiftpkg_swift_openapi_runtime//:Sources_OpenAPIRuntime"],
-+)
-diff --git a/Examples/GreetingService/Tests/GreetingServiceMockTests/BUILD.bazel b/Examples/GreetingService/Tests/GreetingServiceMockTests/BUILD.bazel
-new file mode 100644
-index 0000000..a6d13fc
---- /dev/null
-+++ b/Examples/GreetingService/Tests/GreetingServiceMockTests/BUILD.bazel
-@@ -0,0 +1,11 @@
-+load("@rules_swift//swift:swift.bzl", "swift_test")
-+
-+swift_test(
-+    name = "GreetingServiceMockTests",
-+    srcs = [
-+        "MockGreetingService.swift",
-+        "MockGreetingServiceTests.swift",
-+    ],
-+    module_name = "GreetingServiceMockTests",
-+    deps = ["//Examples/GreetingService/Sources/GreetingService"],
-+)
-diff --git a/Examples/GreetingServiceClient/Sources/GreetingServiceClient/BUILD.bazel b/Examples/GreetingServiceClient/Sources/GreetingServiceClient/BUILD.bazel
-new file mode 100644
-index 0000000..fcb5a1f
---- /dev/null
-+++ b/Examples/GreetingServiceClient/Sources/GreetingServiceClient/BUILD.bazel
-@@ -0,0 +1,9 @@
-+load("@rules_swift//swift:swift.bzl", "swift_binary")
-+
-+swift_binary(
-+    name = "GreetingServiceClient",
-+    srcs = ["GreetingServiceClient.swift"],
-+    module_name = "GreetingServiceClient",
-+    visibility = ["//visibility:public"],
-+    deps = ["@swiftpkg_swift_openapi_runtime//:Sources_OpenAPIRuntime"],
-+)
-diff --git a/Examples/GreetingServiceClient/Tests/GreetingServiceMockTests/BUILD.bazel b/Examples/GreetingServiceClient/Tests/GreetingServiceMockTests/BUILD.bazel
-new file mode 100644
-index 0000000..144d498
---- /dev/null
-+++ b/Examples/GreetingServiceClient/Tests/GreetingServiceMockTests/BUILD.bazel
-@@ -0,0 +1,11 @@
-+load("@rules_swift//swift:swift.bzl", "swift_test")
-+
-+swift_test(
-+    name = "GreetingServiceMockTests",
-+    srcs = [
-+        "MockGreetingService.swift",
-+        "MockGreetingServiceTests.swift",
-+    ],
-+    module_name = "GreetingServiceMockTests",
-+    deps = ["//Examples/GreetingServiceClient/Sources/GreetingServiceClient"],
-+)
-diff --git a/IntegrationTest/Sources/Client/BUILD.bazel b/IntegrationTest/Sources/Client/BUILD.bazel
-new file mode 100644
-index 0000000..2e5bbe2
---- /dev/null
-+++ b/IntegrationTest/Sources/Client/BUILD.bazel
-@@ -0,0 +1,8 @@
-+load("@rules_swift//swift:swift.bzl", "swift_library")
-+
-+swift_library(
-+    name = "Client",
-+    srcs = ["Empty.swift"],
-+    module_name = "Client",
-+    visibility = ["//visibility:public"],
-+)
-diff --git a/IntegrationTest/Sources/MockTransportClient/BUILD.bazel b/IntegrationTest/Sources/MockTransportClient/BUILD.bazel
-new file mode 100644
-index 0000000..99501ea
---- /dev/null
-+++ b/IntegrationTest/Sources/MockTransportClient/BUILD.bazel
-@@ -0,0 +1,13 @@
-+load("@rules_swift//swift:swift.bzl", "swift_library")
-+
-+swift_library(
-+    name = "MockTransportClient",
-+    srcs = ["Client.swift"],
-+    module_name = "MockTransportClient",
-+    visibility = ["//visibility:public"],
-+    deps = [
-+        "//IntegrationTest/Sources/Client",
-+        "//IntegrationTest/Sources/Types",
-+        "@swiftpkg_swift_openapi_runtime//:Sources_OpenAPIRuntime",
-+    ],
-+)
-diff --git a/IntegrationTest/Sources/MockTransportServer/BUILD.bazel b/IntegrationTest/Sources/MockTransportServer/BUILD.bazel
-new file mode 100644
-index 0000000..4716d60
---- /dev/null
-+++ b/IntegrationTest/Sources/MockTransportServer/BUILD.bazel
-@@ -0,0 +1,13 @@
-+load("@rules_swift//swift:swift.bzl", "swift_library")
-+
-+swift_library(
-+    name = "MockTransportServer",
-+    srcs = ["Server.swift"],
-+    module_name = "MockTransportServer",
-+    visibility = ["//visibility:public"],
-+    deps = [
-+        "//IntegrationTest/Sources/Server",
-+        "//IntegrationTest/Sources/Types",
-+        "@swiftpkg_swift_openapi_runtime//:Sources_OpenAPIRuntime",
-+    ],
-+)
-diff --git a/IntegrationTest/Sources/Server/BUILD.bazel b/IntegrationTest/Sources/Server/BUILD.bazel
-new file mode 100644
-index 0000000..dd8c037
---- /dev/null
-+++ b/IntegrationTest/Sources/Server/BUILD.bazel
-@@ -0,0 +1,8 @@
-+load("@rules_swift//swift:swift.bzl", "swift_library")
-+
-+swift_library(
-+    name = "Server",
-+    srcs = ["Empty.swift"],
-+    module_name = "Server",
-+    visibility = ["//visibility:public"],
-+)
-diff --git a/IntegrationTest/Sources/Types/BUILD.bazel b/IntegrationTest/Sources/Types/BUILD.bazel
-new file mode 100644
-index 0000000..dccba42
---- /dev/null
-+++ b/IntegrationTest/Sources/Types/BUILD.bazel
-@@ -0,0 +1,8 @@
-+load("@rules_swift//swift:swift.bzl", "swift_library")
-+
-+swift_library(
-+    name = "Types",
-+    srcs = ["Empty.swift"],
-+    module_name = "Types",
-+    visibility = ["//visibility:public"],
-+)
 diff --git a/Plugins/OpenAPIGenerator/BUILD.bazel b/Plugins/OpenAPIGenerator/BUILD.bazel
 new file mode 100644
 index 0000000..80c770f
@@ -231,10 +87,10 @@ index 0000000..6f45956
 +)
 diff --git a/Sources/PetstoreConsumerTestCore/BUILD.bazel b/Sources/PetstoreConsumerTestCore/BUILD.bazel
 new file mode 100644
-index 0000000..22d7b4e
+index 0000000..5e01524
 --- /dev/null
 +++ b/Sources/PetstoreConsumerTestCore/BUILD.bazel
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,17 @@
 +load("@rules_swift//swift:swift.bzl", "swift_library")
 +
 +swift_library(
@@ -247,7 +103,10 @@ index 0000000..22d7b4e
 +    ],
 +    module_name = "PetstoreConsumerTestCore",
 +    visibility = ["//visibility:public"],
-+    deps = ["@swiftpkg_swift_openapi_runtime//:Sources_OpenAPIRuntime"],
++    deps = [
++        "@swiftpkg_swift_http_types//:Sources_HTTPTypes",
++        "@swiftpkg_swift_openapi_runtime//:Sources_OpenAPIRuntime",
++    ],
 +)
 diff --git a/Sources/_OpenAPIGeneratorCore/BUILD.bazel b/Sources/_OpenAPIGeneratorCore/BUILD.bazel
 new file mode 100644
@@ -429,10 +288,10 @@ index 0000000..8eaffd7
 +)
 diff --git a/Tests/OpenAPIGeneratorReferenceTests/BUILD.bazel b/Tests/OpenAPIGeneratorReferenceTests/BUILD.bazel
 new file mode 100644
-index 0000000..9fc8868
+index 0000000..92de772
 --- /dev/null
 +++ b/Tests/OpenAPIGeneratorReferenceTests/BUILD.bazel
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,21 @@
 +load("@rules_swift//swift:swift.bzl", "swift_test")
 +
 +swift_test(
@@ -449,16 +308,17 @@ index 0000000..9fc8868
 +    module_name = "OpenAPIGeneratorReferenceTests",
 +    deps = [
 +        "@swiftpkg_openapikit//:Sources_OpenAPIKitCompat",
++        "@swiftpkg_swift_http_types//:Sources_HTTPTypes",
 +        "@swiftpkg_swift_openapi_runtime//:Sources_OpenAPIRuntime",
 +        "@swiftpkg_yams//:Sources_Yams",
 +    ],
 +)
 diff --git a/Tests/PetstoreConsumerTests/BUILD.bazel b/Tests/PetstoreConsumerTests/BUILD.bazel
 new file mode 100644
-index 0000000..c870a2f
+index 0000000..be589f9
 --- /dev/null
 +++ b/Tests/PetstoreConsumerTests/BUILD.bazel
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,21 @@
 +load("@rules_swift//swift:swift.bzl", "swift_library")
 +
 +swift_library(
@@ -476,6 +336,7 @@ index 0000000..c870a2f
 +    visibility = ["//visibility:public"],
 +    deps = [
 +        "//Sources/PetstoreConsumerTestCore",
++        "@swiftpkg_swift_http_types//:Sources_HTTPTypes",
 +        "@swiftpkg_swift_openapi_runtime//:Sources_OpenAPIRuntime",
 +    ],
 +)

internal/update.sh

@@ -75,6 +75,7 @@ tar -xzf archive.tar.gz
 rm archive.tar.gz
 cd "swift-openapi-generator-${VERSION}"
 git init &>/dev/null                    # git init usually prints a message
+rm -rf Examples IntegrationTest
 git add .
 git commit -m "Base commit" &>/dev/null
 touch WORKSPACE

swift_deps_index.json

@@ -4,6 +4,7 @@
     "swift-algorithms",
     "swift-argument-parser",
     "swift-docc-plugin",
+    "swift-http-types",
     "swift-openapi-runtime",
     "yams"
   ],
@@ -388,9 +389,9 @@
       "name": "swiftpkg_openapikit",
       "identity": "openapikit",
       "remote": {
-        "commit": "b00b08d05e6fba0e156c06be3332b9774e172afd",
-        "remote": "https://github.com/mattpolzin/OpenAPIKit.git",
-        "version": "3.1.1"
+        "commit": "283454875cc6e5b2801d184d65835b92252d1784",
+        "remote": "https://github.com/mattpolzin/OpenAPIKit",
+        "version": "3.1.2"
       }
     },
     {
@@ -406,9 +407,9 @@
       "name": "swiftpkg_swift_argument_parser",
       "identity": "swift-argument-parser",
       "remote": {
-        "commit": "8f4d2753f0e4778c76d5f05ad16c74f707390531",
-        "remote": "https://github.com/apple/swift-argument-parser.git",
-        "version": "1.2.3"
+        "commit": "c8ed701b513cf5177118a175d85fbbbcd707ab41",
+        "remote": "https://github.com/apple/swift-argument-parser",
+        "version": "1.3.0"
       }
     },
     {
@@ -433,9 +434,9 @@
       "name": "swiftpkg_swift_http_types",
       "identity": "swift-http-types",
       "remote": {
-        "commit": "1827dc94bdab2eb5f2fc804e9b0cb43574282566",
+        "commit": "12358d55a3824bd5fed310b999ea8cf83a9a1a65",
         "remote": "https://github.com/apple/swift-http-types",
-        "version": "1.0.2"
+        "version": "1.0.3"
       }
     },
     {
@@ -451,17 +452,17 @@
       "name": "swiftpkg_swift_openapi_runtime",
       "identity": "swift-openapi-runtime",
       "remote": {
-        "commit": "7d1644b125c02be1bedcfe1a69b58fae881b2393",
+        "commit": "76951d77a0609599d2dc233e7e40808a74767c6a",
         "remote": "https://github.com/apple/swift-openapi-runtime",
-        "version": "1.0.0-alpha.1"
+        "version": "1.3.2"
       }
     },
     {
       "name": "swiftpkg_yams",
       "identity": "yams",
       "remote": {
         "commit": "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3",
-        "remote": "https://github.com/jpsim/Yams.git",
+        "remote": "https://github.com/jpsim/Yams",
         "version": "5.0.6"
       }
     }