Skip to content

Commit 7139803

Browse files
authored
Merge pull request #299 from tayloraswift/adopt-unixtime
adopt swift-unixtime
2 parents f74d675 + 8852181 commit 7139803

File tree

79 files changed

+220
-4392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+220
-4392
lines changed

Macros/CasesByIntegerEncodingMacro/GenerateCasesByIntegerEncoding.swift

Lines changed: 0 additions & 5 deletions
This file was deleted.

Macros/CasesByIntegerEncodingMacro/RawRepresentableByIntegerEncoding.swift

Lines changed: 0 additions & 6 deletions
This file was deleted.

Macros/UnidocMacros/GenerateCasesByIntegerEncoding.swift

Lines changed: 0 additions & 106 deletions
This file was deleted.

Macros/UnidocMacros/MacroExpansionContext (ext).swift

Lines changed: 0 additions & 27 deletions
This file was deleted.

Macros/UnidocMacros/MacroExpansionMessage.swift

Lines changed: 0 additions & 21 deletions
This file was deleted.

Macros/UnidocMacros/Main.swift

Lines changed: 0 additions & 8 deletions
This file was deleted.

Package.resolved

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

Package.swift

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ let package:Package = .init(
1313

1414
.library(name: "guides", targets: ["guides"]),
1515

16-
.library(name: "CasesByIntegerEncodingMacro", targets: ["CasesByIntegerEncodingMacro"]),
17-
1816
.library(name: "ArgumentParsing", targets: ["ArgumentParsing"]),
1917
.library(name: "Availability", targets: ["Availability"]),
2018
.library(name: "AvailabilityDomain", targets: ["AvailabilityDomain"]),
@@ -28,7 +26,6 @@ let package:Package = .init(
2826
.library(name: "HTTPServer", targets: ["HTTPServer"]),
2927

3028
.library(name: "IP", targets: ["IP"]),
31-
.library(name: "ISO", targets: ["ISO"]),
3229
.library(name: "InlineArray", targets: ["InlineArray"]),
3330

3431
.library(name: "InlineDictionary", targets: ["InlineDictionary"]),
@@ -89,15 +86,14 @@ let package:Package = .init(
8986
dependencies: [
9087
.package(url: "https://github.com/tayloraswift/swift-dom", .upToNextMinor(
9188
from: "1.1.0")),
92-
// .package(path: "../swift-dom"),
93-
9489
.package(url: "https://github.com/tayloraswift/swift-grammar", .upToNextMinor(
9590
from: "0.4.0")),
9691
.package(url: "https://github.com/tayloraswift/swift-hash", .upToNextMinor(
9792
from: "0.6.0")),
9893
.package(url: "https://github.com/tayloraswift/swift-mongodb", .upToNextMinor(
99-
from: "0.22.0")),
100-
// .package(path: "../swift-mongodb"),
94+
from: "0.23.0")),
95+
.package(url: "https://github.com/tayloraswift/swift-unixtime", .upToNextMinor(
96+
from: "0.1.0")),
10197

10298
.package(url: "https://github.com/tayloraswift/swift-json", .upToNextMinor(
10399
from: "1.1.0")),
@@ -127,20 +123,6 @@ let package:Package = .init(
127123
from: "510.0.2"),
128124
],
129125
targets: [
130-
.macro(name: "UnidocMacros",
131-
dependencies: [
132-
.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
133-
.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
134-
],
135-
path: "Macros/UnidocMacros"),
136-
137-
.target(name: "CasesByIntegerEncodingMacro",
138-
dependencies: [
139-
.target(name: "UnidocMacros"),
140-
],
141-
path: "Macros/CasesByIntegerEncodingMacro"),
142-
143-
144126
.executableTarget(name: "ssgc",
145127
dependencies: [
146128
.target(name: "ArgumentParsing"),
@@ -175,12 +157,10 @@ let package:Package = .init(
175157
.target(name: "SemanticVersions"),
176158
]),
177159

178-
.target(name: "DynamicTime"),
179-
180160
.target(name: "Fingerprinting",
181161
dependencies: [
182162
.target(name: "HTTP"),
183-
.target(name: "ISO"),
163+
.product(name: "ISO", package: "swift-unixtime"),
184164
]),
185165

186166
.target(name: "FNV1"),
@@ -195,15 +175,15 @@ let package:Package = .init(
195175

196176
.target(name: "GitHubAPI",
197177
dependencies: [
198-
.target(name: "UnixTime"),
178+
.product(name: "UnixTime", package: "swift-unixtime"),
199179
.product(name: "JSON", package: "swift-json"),
200180
.product(name: "SHA1", package: "swift-hash"),
201181
]),
202182

203183
.target(name: "HTTP",
204184
dependencies: [
205-
.target(name: "ISO"),
206185
.target(name: "Media"),
186+
.product(name: "ISO", package: "swift-unixtime"),
207187
.product(name: "MD5", package: "swift-hash"),
208188
.product(name: "NIOCore", package: "swift-nio"),
209189
]),
@@ -243,17 +223,6 @@ let package:Package = .init(
243223

244224
.target(name: "InlineDictionary"),
245225

246-
.target(name: "ISO",
247-
dependencies: [
248-
.target(name: "CasesByIntegerEncodingMacro"),
249-
],
250-
exclude: [
251-
// "ISO.Country (gen).swift",
252-
"ISO.Country.swift",
253-
// "ISO.Macrolanguage (gen).swift",
254-
"ISO.Macrolanguage.swift",
255-
]),
256-
257226
.target(name: "LexicalPaths"),
258227

259228
.target(name: "LinkResolution",
@@ -350,7 +319,7 @@ let package:Package = .init(
350319
.target(name: "HTTPClient"),
351320
.target(name: "Media"),
352321
.target(name: "S3"),
353-
.target(name: "UnixTime"),
322+
.product(name: "UnixCalendar", package: "swift-unixtime"),
354323
.product(name: "NIOCore", package: "swift-nio"),
355324
.product(name: "NIOHTTP1", package: "swift-nio"),
356325
.product(name: "SHA2", package: "swift-hash"),
@@ -511,7 +480,7 @@ let package:Package = .init(
511480
.target(name: "UnidocRecords_LZ77"),
512481
.target(name: "UnidocLinker"),
513482
.target(name: "UnidocRecords"),
514-
.target(name: "UnixTime"),
483+
.product(name: "UnixCalendar", package: "swift-unixtime"),
515484
.product(name: "MongoDB", package: "swift-mongodb"),
516485
]),
517486

@@ -550,8 +519,7 @@ let package:Package = .init(
550519
.target(name: "Media"),
551520
.target(name: "UnidocAssets"),
552521
.target(name: "UnidocRecords"),
553-
.target(name: "UnixTime"),
554-
522+
.product(name: "UnixCalendar", package: "swift-unixtime"),
555523
.product(name: "HTML", package: "swift-dom"),
556524
]),
557525

@@ -576,17 +544,15 @@ let package:Package = .init(
576544

577545
.target(name: "UnidocUI",
578546
dependencies: [
579-
.target(name: "DynamicTime"),
580547
.target(name: "GitHubAPI"),
581548
.target(name: "PieCharts"),
582549
.target(name: "UnidocRender"),
583550
.target(name: "UnidocAPI"),
584551
.target(name: "UnidocQueries"),
585552
.target(name: "URI"),
553+
.product(name: "UnixTime", package: "swift-unixtime"),
586554
]),
587555

588-
.target(name: "UnixTime"),
589-
590556
.target(name: "URI",
591557
dependencies: [
592558
.product(name: "Grammar", package: "swift-grammar"),

Sources/DynamicTime/Duration.DynamicFormat.Unit.swift

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)