From 98021667445907eb20e651dcda882f8964851469 Mon Sep 17 00:00:00 2001 From: fhasse95 <49185957+fhasse95@users.noreply.github.com> Date: Wed, 17 Jun 2026 22:23:02 +0200 Subject: [PATCH] macOS 13 Support --- Package.swift | 2 +- Sources/SkipKit/AppInfo.swift | 2 +- Sources/SkipKit/DeviceInfo.swift | 2 +- Sources/SkipKit/WebBrowser.swift | 2 +- Tests/SkipKitTests/SkipKitTests.swift | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index a872f4f..abb7a4c 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ import PackageDescription let package = Package( name: "skip-kit", defaultLocalization: "en", - platforms: [.iOS(.v16), .macOS(.v14), .tvOS(.v16), .watchOS(.v9), .macCatalyst(.v16)], + platforms: [.iOS(.v16), .macOS(.v13), .tvOS(.v16), .watchOS(.v9), .macCatalyst(.v16)], products: [ .library(name: "SkipKit", targets: ["SkipKit"]), ], diff --git a/Sources/SkipKit/AppInfo.swift b/Sources/SkipKit/AppInfo.swift index 496e087..30b0cef 100644 --- a/Sources/SkipKit/AppInfo.swift +++ b/Sources/SkipKit/AppInfo.swift @@ -265,7 +265,7 @@ private let _deviceModel: String = { uname(&systemInfo) return withUnsafePointer(to: &systemInfo.machine) { $0.withMemoryRebound(to: CChar.self, capacity: 1) { - String(validatingUTF8: $0) ?? "Unknown" + String(validatingCString: $0) ?? "Unknown" } } #else diff --git a/Sources/SkipKit/DeviceInfo.swift b/Sources/SkipKit/DeviceInfo.swift index 9f3e95e..d91ee80 100644 --- a/Sources/SkipKit/DeviceInfo.swift +++ b/Sources/SkipKit/DeviceInfo.swift @@ -210,7 +210,7 @@ public final class DeviceInfo { uname(&systemInfo) return withUnsafePointer(to: &systemInfo.machine) { $0.withMemoryRebound(to: CChar.self, capacity: 1) { - String(validatingUTF8: $0) ?? "Unknown" + String(validatingCString: $0) ?? "Unknown" } } #else diff --git a/Sources/SkipKit/WebBrowser.swift b/Sources/SkipKit/WebBrowser.swift index 51542f9..0e7a929 100644 --- a/Sources/SkipKit/WebBrowser.swift +++ b/Sources/SkipKit/WebBrowser.swift @@ -126,7 +126,7 @@ extension View { } #elseif os(macOS) // macOS does not have SFSafariViewController; fall back to system browser - self.onChange(of: isPresented.wrappedValue) { oldPresented, newPresented in + self.onChange(of: isPresented.wrappedValue) { newPresented in if newPresented { NSWorkspace.shared.open(url) isPresented.wrappedValue = false diff --git a/Tests/SkipKitTests/SkipKitTests.swift b/Tests/SkipKitTests/SkipKitTests.swift index a035d37..ab298f9 100644 --- a/Tests/SkipKitTests/SkipKitTests.swift +++ b/Tests/SkipKitTests/SkipKitTests.swift @@ -22,7 +22,7 @@ final class SkipKitTests: XCTestCase { var addedKeys = Set() // Cache has no `count` accessor, so we brute-force check for the existance of every key we have added - var cacheCount = { addedKeys.compactMap({ cache[$0] }).count } + let cacheCount = { addedKeys.compactMap({ cache[$0] }).count } @discardableResult func addData(size: Int) -> UUID { let key = UUID()