sjs/samhuri.net
1
0
Fork 0
mirror of https://github.com/samsonjs/samhuri.net.git synced 2026-04-27 14:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to Swift 6

Browse source
This commit is contained in:
Sami Samhuri 2025-04-21 13:50:12 -07:00
parent ecd9ad3b3e
commit 9db609e8d8
No known key found for this signature in database
6 changed files with 12 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gensite/Package.swift
View file

@ -1,4 +1,4 @@
// swift-tools-version:5.10 // swift-tools-version:6.0
// The swift-tools-version declares the minimum version of Swift required to build this package. // The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription import PackageDescription

2
samhuri.net/Package.swift
View file

@ -1,4 +1,4 @@
// swift-tools-version:5.10 // swift-tools-version:6.0
// The swift-tools-version declares the minimum version of Swift required to build this package. // The swift-tools-version declares the minimum version of Swift required to build this package.
import PackageDescription import PackageDescription

8
samhuri.net/Sources/samhuri.net/Dates/Date+Sugar.swift
View file

@ -8,17 +8,15 @@
import Foundation import Foundation
extension Date { extension Date {
static var defaultCalendar = Calendar.current
var year: Int { var year: Int {
Date.defaultCalendar.dateComponents([.year], from: self).year! Calendar.current.dateComponents([.year], from: self).year!
} }
var month: Int { var month: Int {
Date.defaultCalendar.dateComponents([.month], from: self).month! Calendar.current.dateComponents([.month], from: self).month!
} }
var day: Int { var day: Int {
Date.defaultCalendar.dateComponents([.day], from: self).day! Calendar.current.dateComponents([.day], from: self).day!
} }
} }

2
samhuri.net/Sources/samhuri.net/Posts/PostMetadata.swift
View file

@ -24,7 +24,7 @@ extension PostMetadata {
case invalidTimestamp(String?) case invalidTimestamp(String?)
} }
private static let iso8601Formatter = ISO8601DateFormatter() nonisolated(unsafe) private static let iso8601Formatter = ISO8601DateFormatter()
init(dictionary: [String: String], slug: String) throws { init(dictionary: [String: String], slug: String) throws {
let requiredKeys = ["Title", "Author", "Date", "Timestamp"] let requiredKeys = ["Title", "Author", "Date", "Timestamp"]

12
samhuri.net/Sources/samhuri.net/Posts/PostRepo.swift
View file

@ -12,17 +12,17 @@ struct RawPost {
let slug: String let slug: String
let markdown: String let markdown: String
private static let StripMetadataRegex = try! Regex(#"---\n.*?---\n"#).dotMatchesNewlines() private nonisolated(unsafe) static let StripMetadataRegex = try! Regex(#"---\n.*?---\n"#).dotMatchesNewlines()
private static let TextifyParenthesesLinksRegex = try! Regex(#"\[([\w\s.-_]*)\]\([^)]+\)"#) private nonisolated(unsafe) static let TextifyParenthesesLinksRegex = try! Regex(#"\[([\w\s.-_]*)\]\([^)]+\)"#)
private static let TextifyBracketLinksRegex = try! Regex(#"\[([\w\s.-_]*)\]\[[^\]]+\]"#) private nonisolated(unsafe) static let TextifyBracketLinksRegex = try! Regex(#"\[([\w\s.-_]*)\]\[[^\]]+\]"#)
private static let StripImagesRegex = try! Regex(#"!\[[\w\s.-_]*\]\([^)]+\)"#) private nonisolated(unsafe) static let StripImagesRegex = try! Regex(#"!\[[\w\s.-_]*\]\([^)]+\)"#)
private static let WhitespaceRegex = try! Regex(#"\s+"#) private nonisolated(unsafe) static let WhitespaceRegex = try! Regex(#"\s+"#)
private static let StripHTMLTagsRegex = try! Regex(#"<[^>]+>"#) private nonisolated(unsafe) static let StripHTMLTagsRegex = try! Regex(#"<[^>]+>"#)
var excerpt: String { var excerpt: String {
markdown markdown

37
samhuri.net/Tests/samhuri.netTests/Dates/Date+SugarTests.swift
View file

@ -1,37 +0,0 @@
//
// Date+SugarTests.swift
// samhuri.net
//
// Created by Sami Samhuri on 2019-12-31.
//
import Foundation
@testable import samhuri_net
import Testing
class DateSugarTests {
let date: Date
init() {
var calendar = Calendar(identifier: .gregorian)
calendar.timeZone = TimeZone(secondsFromGMT: 0)!
Date.defaultCalendar = calendar
date = Date(timeIntervalSince1970: 0)
}
deinit {
Date.defaultCalendar = .current
}
@Test func year() {
#expect(date.year == 1970)
}
@Test func month() {
#expect(date.month == 1)
}
@Test func day() {
#expect(date.day == 1)
}
}