Skip to content

Commit 92bffd1

Browse files
authored
Bump to 1.0.0-alpha.1 (#400)
Bump to 1.0.0-alpha.1 ### Motivation Prep for 1.0.0-alpha.1. ### Modifications Bumped documentation and upstream SOAR dependencies to 1.0.0-alpha.1. Note that because the generator itself is not yet released, the integration test and examples will fail to build, but that's the unfortunate nature of having examples projects in the same repo as the project itself. But it's important that once this repo is tagged, that the examples/integration tests included use the right tags, so I don't think there's another way to stage this in. ### Result Ready to tag 1.0.0-alpha.1. ### Test Plan Temporarily modified the generator dependency in examples/integration tests to point to `main` and verified all works. Then changed it back. All other tests pass. Reviewed by: simonjbeaumont Builds: ✔︎ pull request validation (5.10) - Build finished. ✔︎ pull request validation (5.9) - Build finished. ✔︎ pull request validation (compatibility test) - Build finished. ✔︎ pull request validation (docc test) - Build finished. ✔︎ pull request validation (nightly) - Build finished. ✔︎ pull request validation (soundness) - Build finished. ✖︎ pull request validation (integration test) - Build finished. #400
1 parent 13df787 commit 92bffd1

File tree

16 files changed

+52
-41
lines changed

16 files changed

+52
-41
lines changed

Examples/GreetingService/Package.swift

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ let package = Package(
1818
name: "GreetingService",
1919
platforms: [.macOS(.v13)],
2020
dependencies: [
21-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
22-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
23-
.package(url: "https://github.com/swift-server/swift-openapi-vapor", .upToNextMinor(from: "0.3.0")),
21+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
22+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
23+
.package(url: "https://github.com/swift-server/swift-openapi-vapor", exact: "1.0.0-alpha.1"),
2424
.package(url: "https://github.com/vapor/vapor", from: "4.76.0"),
2525
],
2626
targets: [
@@ -35,7 +35,11 @@ let package = Package(
3535
),
3636
.testTarget(
3737
name: "GreetingServiceMockTests",
38-
dependencies: ["GreetingService", .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime")]
38+
dependencies: [
39+
"GreetingService", .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
40+
.product(name: "OpenAPIVapor", package: "swift-openapi-vapor"),
41+
.product(name: "Vapor", package: "vapor"),
42+
]
3943
),
4044
]
4145
)

Examples/GreetingServiceClient/Package.swift

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.8
1+
// swift-tools-version:5.9
22
//===----------------------------------------------------------------------===//
33
//
44
// This source file is part of the SwiftOpenAPIGenerator open source project
@@ -18,9 +18,9 @@ let package = Package(
1818
name: "GreetingServiceClient",
1919
platforms: [.macOS(.v13)],
2020
dependencies: [
21-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
22-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
23-
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.3.0")),
21+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
22+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
23+
.package(url: "https://github.com/apple/swift-openapi-urlsession", exact: "1.0.0-alpha.1"),
2424
],
2525
targets: [
2626
.executableTarget(
@@ -30,6 +30,13 @@ let package = Package(
3030
.product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession"),
3131
],
3232
plugins: [.plugin(name: "OpenAPIGenerator", package: "swift-openapi-generator")]
33-
)
33+
),
34+
.testTarget(
35+
name: "GreetingServiceMockTests",
36+
dependencies: [
37+
"GreetingServiceClient", .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
38+
.product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession"),
39+
]
40+
),
3441
]
3542
)

Examples/GreetingServiceClient/Tests/GreetingServiceMockTests/MockGreetingService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
1313
//===----------------------------------------------------------------------===//
14-
import GreetingService
14+
import GreetingServiceClient
1515

1616
// Mock operates on value types, and requires no concrete client or server transport.
1717
struct MockGreetingService: APIProtocol {

Examples/GreetingServiceClient/Tests/GreetingServiceMockTests/MockGreetingServiceTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414
import XCTest
15-
@testable import GreetingService
15+
@testable import GreetingServiceClient
1616

1717
final class GreetingServiceMockTests: XCTestCase {
1818
func testWithMock() async throws {

IntegrationTest/Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ let package = Package(
2424
)
2525
],
2626
dependencies: [
27-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
28-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
27+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
28+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
2929
],
3030
targets: [
3131
.target(

IntegrationTest/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Simple Integration Test
1+
# Integration Test
22

33
A Swift package used as an integration test in the Swift OpenAPI Generator ecosystem.
44

@@ -11,7 +11,7 @@ For example, from the pull request pipeline for that project, you can do the fol
1111
```sh
1212
# Clone the generator repo and go into the integration test directory
1313
git clone https://github.com/apple/swift-openapi-generator
14-
cd swift-openapi-generator/IntegrationTests/Simple
14+
cd swift-openapi-generator/IntegrationTests
1515

1616
# Use Swift PM to override the dependency for the package you want to test
1717
swift package edit swift-openapi-runtime path/to/checkout/of/swift-openapi-runtime

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ let package = Package(
6060
// Tests-only: Runtime library linked by generated code, and also
6161
// helps keep the runtime library new enough to work with the generated
6262
// code.
63-
.package(url: "https://github.com/apple/swift-openapi-runtime", branch: "main"),
63+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
6464

6565
// Build and preview docs
6666
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),

Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/client.Package.2.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ let package = Package(
1010
.watchOS(.v6),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
14-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
15-
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.3.0")),
13+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
14+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
15+
.package(url: "https://github.com/apple/swift-openapi-urlsession", exact: "1.0.0-alpha.1"),
1616
],
1717
targets: [
1818
.executableTarget(

Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/client.Package.3.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ let package = Package(
1010
.watchOS(.v6),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
14-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
15-
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.3.0")),
13+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
14+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
15+
.package(url: "https://github.com/apple/swift-openapi-urlsession", exact: "1.0.0-alpha.1"),
1616
],
1717
targets: [
1818
.executableTarget(

Sources/swift-openapi-generator/Documentation.docc/Tutorials/_Resources/client.Package.4.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ let package = Package(
1010
.watchOS(.v6),
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/apple/swift-openapi-generator", .upToNextMinor(from: "0.3.0")),
14-
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
15-
.package(url: "https://github.com/apple/swift-openapi-urlsession", .upToNextMinor(from: "0.3.0")),
13+
.package(url: "https://github.com/apple/swift-openapi-generator", exact: "1.0.0-alpha.1"),
14+
.package(url: "https://github.com/apple/swift-openapi-runtime", exact: "1.0.0-alpha.1"),
15+
.package(url: "https://github.com/apple/swift-openapi-urlsession", exact: "1.0.0-alpha.1"),
1616
],
1717
targets: [
1818
.executableTarget(

0 commit comments

Comments
 (0)