Fix 5.8 support

Wouter01 · Apr 26, 2024 · 6f83694 · 6f83694
1 parent 5378baf
commit 6f83694
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/Sources/LogStream/LogMessage.swift b/Sources/LogStream/LogMessage.swift
@@ -45,7 +45,7 @@ extension LogMessage: Hashable {
 }
 
 extension LogMessage {
-    init(_ event: LoggingSupport._OSActivityLogMessageEvent) {
+    init(_ event: _OSActivityLogMessageEvent) {
         self.init(
             message: event.eventMessage,
             date: event.timestamp,

diff --git a/Sources/LogStream/LogStream.swift b/Sources/LogStream/LogStream.swift
@@ -96,7 +96,7 @@ public enum LogStream {
         LogStream.logs(for: -1, flags: flags)
     }
 
-    static let messageClass = unsafeBitCast(NSClassFromString("OSActivityLogMessageEvent"), to: LoggingSupport._OSActivityLogMessageEvent.Type.self)
+    static let messageClass = unsafeBitCast(NSClassFromString("OSActivityLogMessageEvent"), to: _OSActivityLogMessageEvent.Type.self)
 
     static func createStream(
         pid: pid_t,

diff --git a/Sources/LogStream/LoggingSupport.swift b/Sources/LogStream/LoggingSupport.swift
@@ -9,10 +9,17 @@ import Foundation
 import ExternalAppLoggerHeaders
 
 enum LoggingSupport {
+    #if swift(>=5.10)
     nonisolated(unsafe) static let handle = dlopen("/System/Library/PrivateFrameworks/LoggingSupport.framework/LoggingSupport", RTLD_LAZY),
                             streamLog = unsafeBitCast(dlsym(handle, "os_activity_stream_for_pid"), to: StreamLog.self),
                             resumeLog = unsafeBitCast(dlsym(handle, "os_activity_stream_resume"), to: ResumeLog.self),
                             cancelLog = unsafeBitCast(dlsym(handle, "os_activity_stream_cancel"), to: CancelLog.self)
+    #else
+    static let handle = dlopen("/System/Library/PrivateFrameworks/LoggingSupport.framework/LoggingSupport", RTLD_LAZY),
+                            streamLog = unsafeBitCast(dlsym(handle, "os_activity_stream_for_pid"), to: StreamLog.self),
+                            resumeLog = unsafeBitCast(dlsym(handle, "os_activity_stream_resume"), to: ResumeLog.self),
+                            cancelLog = unsafeBitCast(dlsym(handle, "os_activity_stream_cancel"), to: CancelLog.self)
+    #endif
 
     typealias StreamLog = @convention(c) (
         pid_t,
@@ -27,17 +34,15 @@ enum LoggingSupport {
     typealias ActivityStream = OpaquePointer
 }
 
-extension LoggingSupport {
-    @objc
-    protocol _OSActivityLogMessageEvent {
-        var eventMessage: String { get set }
-        var timestamp: Date { get set }
-        var subsystem: String? { get set }
-        var category: String? { get set }
-        var messageType: UInt8 { get set }
-        var process: String { get set }
-        var processID: pid_t { get set }
-
-        init(entry: UnsafeMutablePointer<os_activity_stream_entry_s>)
-    }
+@objc
+protocol _OSActivityLogMessageEvent {
+    var eventMessage: String { get set }
+    var timestamp: Date { get set }
+    var subsystem: String? { get set }
+    var category: String? { get set }
+    var messageType: UInt8 { get set }
+    var process: String { get set }
+    var processID: pid_t { get set }
+
+    init(entry: UnsafeMutablePointer<os_activity_stream_entry_s>)
 }