Skip to content

Commit 8bb3026

Browse files
mattpolzinmattpolzin
authored
Merge pull request #25 from mattpolzin/openapikit-3
Switch to OpenAPIKit 3.0.0
2 parents 7e07288 + f754398 commit 8bb3026

37 files changed

+414
-330
lines changed

‎.github/workflows/tests.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,23 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
image:
16-
- swift:5.3-xenial
17-
- swift:5.3-bionic
18-
- swift:5.3-focal
19-
- swift:5.3-centos8
20-
- swift:5.3-amazonlinux2
16+
- swift:5.9-focal
17+
- swift:5.9-jammy
18+
- swift:5.9-amazonlinux2
2119
container: ${{ matrix.image }}
2220
steps:
2321
- name: Checkout code
2422
uses: actions/checkout@v3
2523
- name: Run tests
26-
run: swift test --enable-test-discovery
24+
run: swift test
2725
osx:
28-
runs-on: macOS-latest
26+
runs-on: macOS-13
2927
steps:
3028
- name: Select latest available Xcode
3129
uses: maxim-lobanov/setup-xcode@v1
32-
with: { 'xcode-version': 'latest' }
30+
with:
31+
xcode-version: latest
3332
- name: Checkout code
3433
uses: actions/checkout@v3
3534
- name: Run tests
36-
run: swift test --enable-test-discovery
35+
run: swift test

‎Package.resolved

+147-149
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,149 @@
11
{
2-
"object": {
3-
"pins": [
4-
{
5-
"package": "Chalk",
6-
"repositoryURL": "https://github.com/mxcl/Chalk.git",
7-
"state": {
8-
"branch": null,
9-
"revision": "9aa9f348b86db3cf6702a3e43c081ecec80cf3c7",
10-
"version": "0.4.0"
11-
}
12-
},
13-
{
14-
"package": "FileCheck",
15-
"repositoryURL": "https://github.com/llvm-swift/FileCheck.git",
16-
"state": {
17-
"branch": null,
18-
"revision": "0dc8a5bff1a7f01e1d7bcc20c79e2127b2ea3eeb",
19-
"version": "0.2.5"
20-
}
21-
},
22-
{
23-
"package": "FineJSON",
24-
"repositoryURL": "https://github.com/omochi/FineJSON.git",
25-
"state": {
26-
"branch": null,
27-
"revision": "05101709243cb66d80c92e645210a3b80cf4e17f",
28-
"version": "1.14.0"
29-
}
30-
},
31-
{
32-
"package": "JSONAPI",
33-
"repositoryURL": "https://github.com/mattpolzin/JSONAPI.git",
34-
"state": {
35-
"branch": null,
36-
"revision": "717f3d610e87705adca2bb91a03fd4e92c433845",
37-
"version": "5.0.1"
38-
}
39-
},
40-
{
41-
"package": "JSONAPIViz",
42-
"repositoryURL": "https://github.com/mattpolzin/JSONAPIViz.git",
43-
"state": {
44-
"branch": null,
45-
"revision": "407422e121c2d73f6dd262071df62481cb4016e9",
46-
"version": "0.0.6"
47-
}
48-
},
49-
{
50-
"package": "OpenAPIKit",
51-
"repositoryURL": "https://github.com/mattpolzin/OpenAPIKit.git",
52-
"state": {
53-
"branch": null,
54-
"revision": "4e7f67551e26b0430297d7720a744df22ed7a018",
55-
"version": "2.3.1"
56-
}
57-
},
58-
{
59-
"package": "OpenAPIReflection",
60-
"repositoryURL": "https://github.com/mattpolzin/OpenAPIReflection.git",
61-
"state": {
62-
"branch": null,
63-
"revision": "2747214f17d17d4662c03d9cbe85e5e3307285ea",
64-
"version": "1.0.0"
65-
}
66-
},
67-
{
68-
"package": "Poly",
69-
"repositoryURL": "https://github.com/mattpolzin/Poly.git",
70-
"state": {
71-
"branch": null,
72-
"revision": "7dd2d0d3e6c0625f36f1b8306a90db12719240c8",
73-
"version": "2.5.2"
74-
}
75-
},
76-
{
77-
"package": "RichJSONParser",
78-
"repositoryURL": "https://github.com/omochi/RichJSONParser.git",
79-
"state": {
80-
"branch": null,
81-
"revision": "263e2ecfe88d0500fa99e4cbc8c948529d335534",
82-
"version": "3.0.0"
83-
}
84-
},
85-
{
86-
"package": "Sampleable",
87-
"repositoryURL": "https://github.com/mattpolzin/Sampleable.git",
88-
"state": {
89-
"branch": null,
90-
"revision": "df44bf1a860481109dcf455e3c6daf0a0f1bc259",
91-
"version": "2.1.0"
92-
}
93-
},
94-
{
95-
"package": "swift-argument-parser",
96-
"repositoryURL": "https://github.com/apple/swift-argument-parser.git",
97-
"state": {
98-
"branch": null,
99-
"revision": "9564d61b08a5335ae0a36f789a7d71493eacadfc",
100-
"version": "0.3.2"
101-
}
102-
},
103-
{
104-
"package": "swift-format",
105-
"repositoryURL": "https://github.com/apple/swift-format.git",
106-
"state": {
107-
"branch": null,
108-
"revision": "12089179aa1668a2478b2b2111d98fa37f3531e3",
109-
"version": "0.50300.0"
110-
}
111-
},
112-
{
113-
"package": "NonEmpty",
114-
"repositoryURL": "https://github.com/pointfreeco/swift-nonempty.git",
115-
"state": {
116-
"branch": null,
117-
"revision": "9ef8c4aea57b8da7fedd5303d29470ea2a00c08d",
118-
"version": "0.2.2"
119-
}
120-
},
121-
{
122-
"package": "SwiftSyntax",
123-
"repositoryURL": "https://github.com/apple/swift-syntax",
124-
"state": {
125-
"branch": null,
126-
"revision": "844574d683f53d0737a9c6d706c3ef31ed2955eb",
127-
"version": "0.50300.0"
128-
}
129-
},
130-
{
131-
"package": "SwiftCheck",
132-
"repositoryURL": "https://github.com/typelift/SwiftCheck.git",
133-
"state": {
134-
"branch": null,
135-
"revision": "077c096c3ddfc38db223ac8e525ad16ffb987138",
136-
"version": "0.12.0"
137-
}
138-
},
139-
{
140-
"package": "Yams",
141-
"repositoryURL": "https://github.com/jpsim/Yams.git",
142-
"state": {
143-
"branch": null,
144-
"revision": "9003d51672e516cc59297b7e96bff1dfdedcb4ea",
145-
"version": "4.0.4"
146-
}
147-
}
148-
]
149-
},
150-
"version": 1
2+
"pins" : [
3+
{
4+
"identity" : "chalk",
5+
"kind" : "remoteSourceControl",
6+
"location" : "https://github.com/mxcl/Chalk.git",
7+
"state" : {
8+
"revision" : "a7f58e47a08ca5a84f73acc4bcf6c2c19d990609",
9+
"version" : "0.5.0"
10+
}
11+
},
12+
{
13+
"identity" : "filecheck",
14+
"kind" : "remoteSourceControl",
15+
"location" : "https://github.com/llvm-swift/FileCheck.git",
16+
"state" : {
17+
"revision" : "f7c5f1a9479b33a876a6f5632ca2b92a7ce4b667",
18+
"version" : "0.2.6"
19+
}
20+
},
21+
{
22+
"identity" : "jsonapi",
23+
"kind" : "remoteSourceControl",
24+
"location" : "https://github.com/mattpolzin/JSONAPI.git",
25+
"state" : {
26+
"revision" : "661dfc3ffec1ba3a201fd067877da2f3c553f236",
27+
"version" : "5.1.0"
28+
}
29+
},
30+
{
31+
"identity" : "jsonapiviz",
32+
"kind" : "remoteSourceControl",
33+
"location" : "https://github.com/mattpolzin/JSONAPIViz.git",
34+
"state" : {
35+
"revision" : "407422e121c2d73f6dd262071df62481cb4016e9",
36+
"version" : "0.0.6"
37+
}
38+
},
39+
{
40+
"identity" : "openapikit",
41+
"kind" : "remoteSourceControl",
42+
"location" : "https://github.com/mattpolzin/OpenAPIKit.git",
43+
"state" : {
44+
"revision" : "ae98338a8e660ae547b058ebb69c010e70b64e31",
45+
"version" : "3.0.0"
46+
}
47+
},
48+
{
49+
"identity" : "openapireflection",
50+
"kind" : "remoteSourceControl",
51+
"location" : "https://github.com/mattpolzin/OpenAPIReflection.git",
52+
"state" : {
53+
"revision" : "aa9d56c75b913818c513a3b0a2cd716b8443e81e",
54+
"version" : "2.0.0"
55+
}
56+
},
57+
{
58+
"identity" : "poly",
59+
"kind" : "remoteSourceControl",
60+
"location" : "https://github.com/mattpolzin/Poly.git",
61+
"state" : {
62+
"revision" : "c108e9e0a2904134719b082f6c18d64406afc6db",
63+
"version" : "2.6.0"
64+
}
65+
},
66+
{
67+
"identity" : "sampleable",
68+
"kind" : "remoteSourceControl",
69+
"location" : "https://github.com/mattpolzin/Sampleable.git",
70+
"state" : {
71+
"revision" : "df44bf1a860481109dcf455e3c6daf0a0f1bc259",
72+
"version" : "2.1.0"
73+
}
74+
},
75+
{
76+
"identity" : "swift-argument-parser",
77+
"kind" : "remoteSourceControl",
78+
"location" : "https://github.com/apple/swift-argument-parser.git",
79+
"state" : {
80+
"revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531",
81+
"version" : "1.2.3"
82+
}
83+
},
84+
{
85+
"identity" : "swift-cmark",
86+
"kind" : "remoteSourceControl",
87+
"location" : "https://github.com/apple/swift-cmark.git",
88+
"state" : {
89+
"revision" : "f218e5d7691f78b55bfa39b367763f4612486c35",
90+
"version" : "0.3.0"
91+
}
92+
},
93+
{
94+
"identity" : "swift-format",
95+
"kind" : "remoteSourceControl",
96+
"location" : "https://github.com/apple/swift-format.git",
97+
"state" : {
98+
"revision" : "83248b4fa37919f78ffbd4650946759bcc54c2b5",
99+
"version" : "509.0.0"
100+
}
101+
},
102+
{
103+
"identity" : "swift-markdown",
104+
"kind" : "remoteSourceControl",
105+
"location" : "https://github.com/apple/swift-markdown.git",
106+
"state" : {
107+
"revision" : "e4f95e2dc23097a1a9a1dfdfe3fe3ee44de77378",
108+
"version" : "0.3.0"
109+
}
110+
},
111+
{
112+
"identity" : "swift-nonempty",
113+
"kind" : "remoteSourceControl",
114+
"location" : "https://github.com/pointfreeco/swift-nonempty.git",
115+
"state" : {
116+
"revision" : "9ef8c4aea57b8da7fedd5303d29470ea2a00c08d",
117+
"version" : "0.2.2"
118+
}
119+
},
120+
{
121+
"identity" : "swift-syntax",
122+
"kind" : "remoteSourceControl",
123+
"location" : "https://github.com/apple/swift-syntax",
124+
"state" : {
125+
"revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036",
126+
"version" : "509.0.2"
127+
}
128+
},
129+
{
130+
"identity" : "swiftcheck",
131+
"kind" : "remoteSourceControl",
132+
"location" : "https://github.com/typelift/SwiftCheck.git",
133+
"state" : {
134+
"revision" : "077c096c3ddfc38db223ac8e525ad16ffb987138",
135+
"version" : "0.12.0"
136+
}
137+
},
138+
{
139+
"identity" : "yams",
140+
"kind" : "remoteSourceControl",
141+
"location" : "https://github.com/jpsim/Yams.git",
142+
"state" : {
143+
"revision" : "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3",
144+
"version" : "5.0.6"
145+
}
146+
}
147+
],
148+
"version" : 2
151149
}

‎Package.swift

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// swift-tools-version:5.2
1+
// swift-tools-version:5.8
22

33
import PackageDescription
44

55
let package = Package(
66
name: "JSONAPI-OpenAPI",
77
platforms: [
8-
.macOS(.v10_11),
8+
.macOS(.v12),
99
],
1010
products: [
1111
.library(
@@ -21,20 +21,20 @@ let package = Package(
2121
dependencies: [
2222
.package(url: "https://github.com/mattpolzin/Sampleable.git", from: "2.0.0"),
2323
.package(url: "https://github.com/mattpolzin/JSONAPI.git", from: "5.0.0"),
24-
.package(url: "https://github.com/mattpolzin/OpenAPIKit.git", from: "2.0.0"),
25-
.package(url: "https://github.com/mattpolzin/OpenAPIReflection.git", from: "1.0.0"),
24+
.package(url: "https://github.com/mattpolzin/OpenAPIKit.git", from: "3.0.0"),
25+
.package(url: "https://github.com/mattpolzin/OpenAPIReflection.git", from: "2.0.0"),
2626
.package(url: "https://github.com/typelift/SwiftCheck.git", .upToNextMinor(from: "0.12.0")),
27-
.package(url: "https://github.com/apple/swift-format.git", from: "0.50300.0"),
28-
.package(name: "NonEmpty", url: "https://github.com/pointfreeco/swift-nonempty.git", .upToNextMinor(from: "0.2.0")),
29-
.package(url: "https://github.com/mattpolzin/JSONAPIViz.git", .exact("0.0.6"))
27+
.package(url: "https://github.com/apple/swift-format.git", from: "509.0.0"),
28+
.package(url: "https://github.com/pointfreeco/swift-nonempty.git", .upToNextMinor(from: "0.2.0")),
29+
.package(url: "https://github.com/mattpolzin/JSONAPIViz.git", exact: "0.0.6")
3030
],
3131
targets: [
3232
.target(
3333
name: "JSONAPIOpenAPI",
3434
dependencies: [
3535
"JSONAPI",
36-
"OpenAPIKit",
37-
"OpenAPIReflection",
36+
.product(name: "OpenAPIKit30", package: "OpenAPIKit"),
37+
.product(name: "OpenAPIReflection30", package: "OpenAPIReflection"),
3838
"Sampleable"
3939
]
4040
),
@@ -51,10 +51,10 @@ let package = Package(
5151
name: "JSONAPISwiftGen",
5252
dependencies: [
5353
"JSONAPI",
54-
"OpenAPIKit",
54+
.product(name: "OpenAPIKit30", package: "OpenAPIKit"),
5555
.product(name: "SwiftFormat", package: "swift-format"),
5656
.product(name: "SwiftFormatConfiguration", package: "swift-format"),
57-
.product(name: "NonEmpty", package: "NonEmpty")
57+
.product(name: "NonEmpty", package: "swift-nonempty")
5858
]
5959
),
6060
.testTarget(

0 commit comments

Comments
 (0)