Skip to content

Commit 87b9ea9

Browse files
committed
adopt swift-unixtime
1 parent f74d675 commit 87b9ea9

File tree

60 files changed

+172
-1198
lines changed

Some content is hidden

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

60 files changed

+172
-1198
lines changed

Package.resolved

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

Package.swift

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,14 @@ let package:Package = .init(
8989
dependencies: [
9090
.package(url: "https://github.com/tayloraswift/swift-dom", .upToNextMinor(
9191
from: "1.1.0")),
92-
// .package(path: "../swift-dom"),
93-
9492
.package(url: "https://github.com/tayloraswift/swift-grammar", .upToNextMinor(
9593
from: "0.4.0")),
9694
.package(url: "https://github.com/tayloraswift/swift-hash", .upToNextMinor(
9795
from: "0.6.0")),
9896
.package(url: "https://github.com/tayloraswift/swift-mongodb", .upToNextMinor(
99-
from: "0.22.0")),
100-
// .package(path: "../swift-mongodb"),
97+
from: "0.23.0")),
98+
.package(url: "https://github.com/tayloraswift/swift-unixtime", .upToNextMinor(
99+
from: "0.1.0")),
101100

102101
.package(url: "https://github.com/tayloraswift/swift-json", .upToNextMinor(
103102
from: "1.1.0")),
@@ -195,7 +194,7 @@ let package:Package = .init(
195194

196195
.target(name: "GitHubAPI",
197196
dependencies: [
198-
.target(name: "UnixTime"),
197+
.product(name: "UnixTime", package: "swift-unixtime"),
199198
.product(name: "JSON", package: "swift-json"),
200199
.product(name: "SHA1", package: "swift-hash"),
201200
]),
@@ -350,7 +349,7 @@ let package:Package = .init(
350349
.target(name: "HTTPClient"),
351350
.target(name: "Media"),
352351
.target(name: "S3"),
353-
.target(name: "UnixTime"),
352+
.product(name: "UnixCalendar", package: "swift-unixtime"),
354353
.product(name: "NIOCore", package: "swift-nio"),
355354
.product(name: "NIOHTTP1", package: "swift-nio"),
356355
.product(name: "SHA2", package: "swift-hash"),
@@ -511,7 +510,7 @@ let package:Package = .init(
511510
.target(name: "UnidocRecords_LZ77"),
512511
.target(name: "UnidocLinker"),
513512
.target(name: "UnidocRecords"),
514-
.target(name: "UnixTime"),
513+
.product(name: "UnixCalendar", package: "swift-unixtime"),
515514
.product(name: "MongoDB", package: "swift-mongodb"),
516515
]),
517516

@@ -550,8 +549,7 @@ let package:Package = .init(
550549
.target(name: "Media"),
551550
.target(name: "UnidocAssets"),
552551
.target(name: "UnidocRecords"),
553-
.target(name: "UnixTime"),
554-
552+
.product(name: "UnixCalendar", package: "swift-unixtime"),
555553
.product(name: "HTML", package: "swift-dom"),
556554
]),
557555

@@ -585,8 +583,6 @@ let package:Package = .init(
585583
.target(name: "URI"),
586584
]),
587585

588-
.target(name: "UnixTime"),
589-
590586
.target(name: "URI",
591587
dependencies: [
592588
.product(name: "Grammar", package: "swift-grammar"),

Sources/GitHubAPI/GitHub.RateLimitError.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ extension GitHub
66
protocol RateLimitError:Error, Equatable, Sendable
77
{
88
/// The UTC epoch second when the rate limit will reset.
9-
var until:UnixInstant { get }
9+
var until:UnixAttosecond { get }
1010
}
1111
}

Sources/GitHubClient/GitHub.Client.RateLimitError.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ extension GitHub.Client
77
struct RateLimitError:GitHub.RateLimitError, Equatable, Sendable
88
{
99
public
10-
let until:UnixInstant
10+
let until:UnixAttosecond
1111

1212
@inlinable internal
13-
init(until:UnixInstant)
13+
init(until:UnixAttosecond)
1414
{
1515
self.until = until
1616
}

Sources/S3Client/AWS.AccessKey (ext).swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import NIOCore
22
import NIOHTTP1
33
import SHA2
4+
import UnixCalendar
45
import UnixTime
56

67
extension AWS.AccessKey
@@ -10,7 +11,7 @@ extension AWS.AccessKey
1011
bucket:AWS.S3.Bucket,
1112
path:String) -> HTTPHeaders
1213
{
13-
let now:UnixInstant = .now()
14+
let now:UnixAttosecond = .now()
1415

1516
guard
1617
let timestamp:Timestamp = now.timestamp

Sources/UnidocDB/Activity/Unidoc.DB.DocsFeed.Activity.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import BSON
22
import MongoQL
33
import Unidoc
44
import UnidocRecords
5+
import UnixTime
56

67
extension Unidoc.DB.DocsFeed
78
{
@@ -13,13 +14,13 @@ extension Unidoc.DB.DocsFeed
1314
{
1415
/// In retrospect, this was a truly awful choice of `_id` key.
1516
public
16-
let id:BSON.Millisecond
17+
let id:UnixMillisecond
1718

1819
public
1920
let volume:Volume
2021

2122
@inlinable public
22-
init(discovered id:BSON.Millisecond, volume:Volume)
23+
init(discovered id:UnixMillisecond, volume:Volume)
2324
{
2425
self.id = id
2526
self.volume = volume

Sources/UnidocDB/Activity/Unidoc.DB.DocsFeed.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import BSON
22
import MongoDB
33
import SymbolGraphs
44
import UnidocRecords
5+
import UnixTime
56

67
extension Unidoc.DB
78
{
@@ -47,10 +48,10 @@ extension Unidoc.DB.DocsFeed
4748
func push(_ activity:Activity<Unidoc.Edition>,
4849
with session:Mongo.Session) async throws -> Bool
4950
{
50-
let (_, inserted):(Activity<Unidoc.Edition>, BSON.Millisecond?) = try await session.run(
51+
let (_, inserted):(Activity<Unidoc.Edition>, UnixMillisecond?) = try await session.run(
5152
command: Mongo.FindAndModify<Mongo.Upserting<
5253
Activity<Unidoc.Edition>,
53-
BSON.Millisecond>>.init(
54+
UnixMillisecond>>.init(
5455
Self.name,
5556
returning: .new)
5657
{

Sources/UnidocDB/Activity/Unidoc.DB.RepoFeed.Activity.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@ import MongoQL
33
import SymbolGraphs
44
import Symbols
55
import UnidocRecords
6+
import UnixTime
67

78
extension Unidoc.DB.RepoFeed
89
{
910
@frozen public
1011
struct Activity:Identifiable, Equatable, Sendable
1112
{
1213
public
13-
let id:BSON.Millisecond
14+
let id:UnixMillisecond
1415

1516
public
1617
let package:Symbol.Package
1718
public
1819
let refname:String
1920

2021
@inlinable public
21-
init(discovered id:BSON.Millisecond,
22+
init(discovered id:UnixMillisecond,
2223
package:Symbol.Package,
2324
refname:String)
2425
{

Sources/UnidocDB/BSON.Millisecond (ext).swift

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

Sources/UnidocDB/Building/Unidoc.BuildProgress.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ import BSON
22
import MongoQL
33
import UnidocAPI
44
import UnidocRecords
5+
import UnixTime
56

67
extension Unidoc
78
{
89
@frozen public
910
struct BuildProgress:Equatable, Sendable
1011
{
1112
public
12-
var started:BSON.Millisecond
13+
var started:UnixMillisecond
1314
public
1415
var builder:Account
1516
public
@@ -18,7 +19,7 @@ extension Unidoc
1819
var stage:BuildStage
1920

2021
@inlinable public
21-
init(started:BSON.Millisecond, builder:Account, request:BuildSelector, stage:BuildStage)
22+
init(started:UnixMillisecond, builder:Account, request:BuildSelector, stage:BuildStage)
2223
{
2324
self.started = started
2425
self.builder = builder

0 commit comments

Comments
 (0)