diff --git a/.swiftformat b/.swiftformat index 66a20d4..e042843 100644 --- a/.swiftformat +++ b/.swiftformat @@ -1,6 +1,6 @@ # Compiler --languagemode 5 ---swiftversion 5.9 +--swiftversion 6.2 # Options --exclude derivedData diff --git a/Package.swift b/Package.swift index 3b33b51..19b121d 100644 --- a/Package.swift +++ b/Package.swift @@ -39,16 +39,16 @@ let package = Package( .product(name: "StatementSQLite", package: "Statement"), .product(name: "SQLite", package: "SQLite.swift"), .product(name: "Mutex", package: "swift-mutex"), - ] + ], ), .testTarget( name: "OccurrenceTests", dependencies: [ .product(name: "Logging", package: "swift-log"), "Occurrence", - ] + ], ), - ] + ], ) for target in package.targets { diff --git a/Sources/Occurrence/CoreData/CoreDataLogProvider.swift b/Sources/Occurrence/CoreData/CoreDataLogProvider.swift index f662311..64ae277 100644 --- a/Sources/Occurrence/CoreData/CoreDataLogProvider.swift +++ b/Sources/Occurrence/CoreData/CoreDataLogProvider.swift @@ -67,7 +67,7 @@ final class CoreDataLogProvider: LogProvider { ofType: NSSQLiteStoreType, configurationName: coordinator.name, at: storeUrl, - options: options + options: options, ) try coordinator.remove(store) } catch { diff --git a/Sources/Occurrence/CoreData/ManagedEntry.swift b/Sources/Occurrence/CoreData/ManagedEntry.swift index d2641fb..85eb94d 100644 --- a/Sources/Occurrence/CoreData/ManagedEntry.swift +++ b/Sources/Occurrence/CoreData/ManagedEntry.swift @@ -56,7 +56,7 @@ extension ManagedEntry { source: source, file: file, function: function, - line: UInt(line) + line: UInt(line), ) } } diff --git a/Sources/Occurrence/Extensions/Logger+Entry.swift b/Sources/Occurrence/Extensions/Logger+Entry.swift index 84f12b6..73bb579 100644 --- a/Sources/Occurrence/Extensions/Logger+Entry.swift +++ b/Sources/Occurrence/Extensions/Logger+Entry.swift @@ -30,7 +30,7 @@ public extension Logger { source: String, file: String = #fileID, function: String = #function, - line: UInt = #line + line: UInt = #line, ) { self.date = date self.subsystem = subsystem diff --git a/Sources/Occurrence/Extensions/Logger+Occurrence.swift b/Sources/Occurrence/Extensions/Logger+Occurrence.swift index 5245854..4f67b43 100644 --- a/Sources/Occurrence/Extensions/Logger+Occurrence.swift +++ b/Sources/Occurrence/Extensions/Logger+Occurrence.swift @@ -22,7 +22,7 @@ public extension Logger { source: @autoclosure () -> String? = nil, file: String = #file, function: String = #function, - line: UInt = #line + line: UInt = #line, ) -> T { log( level: level, @@ -31,7 +31,7 @@ public extension Logger { source: source(), file: file, function: function, - line: line + line: line, ) return error @@ -56,7 +56,7 @@ public extension Logger { source: @autoclosure () -> String? = nil, file: String = #file, function: String = #function, - line: UInt = #line + line: UInt = #line, ) { log( level: level, @@ -65,7 +65,7 @@ public extension Logger { source: source(), file: file, function: function, - line: line + line: line, ) } @@ -88,7 +88,7 @@ public extension Logger { source: @autoclosure () -> String? = nil, file: String = #file, function: String = #function, - line: UInt = #line + line: UInt = #line, ) { guard let jsonObject = try? JSONSerialization.jsonObject(with: data) else { log(level: level, message(), source: source(), file: file, function: function, line: line) @@ -127,7 +127,7 @@ public extension Logger { source: @autoclosure () -> String? = nil, file: String = #file, function: String = #function, - line: UInt = #line + line: UInt = #line, ) { guard let data = try? JSONEncoder().encode(encodable) else { log(level: level, message(), source: source(), file: file, function: function, line: line) diff --git a/Sources/Occurrence/Occurrence.swift b/Sources/Occurrence/Occurrence.swift index 8618a77..e5d2688 100644 --- a/Sources/Occurrence/Occurrence.swift +++ b/Sources/Occurrence/Occurrence.swift @@ -73,7 +73,15 @@ public struct Occurrence: LogHandler { } } - public func log(level: Logger.Level, message: Logger.Message, metadata: Logger.Metadata?, source: String, file: String, function: String, line: UInt) { + public func log( + level: Logger.Level, + message: Logger.Message, + metadata: Logger.Metadata?, + source: String, + file: String, + function: String, + line: UInt, + ) { let joinedMetadata: Logger.Metadata? = switch (metadata, metadataProvider?.get()) { case (.some(let instance), .some(let context)): instance.merging(context, uniquingKeysWith: { instanceValue, _ in instanceValue }) @@ -93,7 +101,7 @@ public struct Occurrence: LogHandler { source: source, file: file, function: function, - line: line + line: line, ) if Self.configuration.outputToConsole { diff --git a/Sources/Occurrence/SQLite/Logger.Filter+Where.swift b/Sources/Occurrence/SQLite/Logger.Filter+Where.swift index ba17c44..da51aa9 100644 --- a/Sources/Occurrence/SQLite/Logger.Filter+Where.swift +++ b/Sources/Occurrence/SQLite/Logger.Filter+Where.swift @@ -38,7 +38,7 @@ extension Logger.Filter { [ .AND( .column(SQLiteEntry.date, op: .greaterThanEqualTo, value: start), - .column(SQLiteEntry.date, op: .lessThanEqualTo, value: end) + .column(SQLiteEntry.date, op: .lessThanEqualTo, value: end), ), ] case .and(let filters): @@ -74,7 +74,7 @@ extension Logger.Filter { [ .AND( .column(SQLiteEntry.date, op: .lessThan, value: start), - .column(SQLiteEntry.date, op: .greaterThan, value: end) + .column(SQLiteEntry.date, op: .greaterThan, value: end), ), ] case .and(let filters): diff --git a/Sources/Occurrence/SQLite/SQLiteLogProvider.swift b/Sources/Occurrence/SQLite/SQLiteLogProvider.swift index ebda713..9f47156 100644 --- a/Sources/Occurrence/SQLite/SQLiteLogProvider.swift +++ b/Sources/Occurrence/SQLite/SQLiteLogProvider.swift @@ -34,7 +34,7 @@ final class SQLiteLogProvider: LogProvider { .column(SQLiteEntry.source), .column(SQLiteEntry.file), .column(SQLiteEntry.function), - .column(SQLiteEntry.line) + .column(SQLiteEntry.line), ), .VALUES( .value(sqlEntry.date), @@ -45,8 +45,8 @@ final class SQLiteLogProvider: LogProvider { .value(sqlEntry.source), .value(sqlEntry.file), .value(sqlEntry.function), - .value(sqlEntry.line) - ) + .value(sqlEntry.line), + ), ).render() do { @@ -61,9 +61,9 @@ final class SQLiteLogProvider: LogProvider { let statement = SQLiteStatement( .SELECT_DISTINCT( - .column(SQLiteEntry.subsystem) + .column(SQLiteEntry.subsystem), ), - .FROM_TABLE(SQLiteEntry.self) + .FROM_TABLE(SQLiteEntry.self), ) let sql = statement.render() @@ -97,14 +97,14 @@ final class SQLiteLogProvider: LogProvider { .column(SQLiteEntry.source), .column(SQLiteEntry.file), .column(SQLiteEntry.function), - .column(SQLiteEntry.line) + .column(SQLiteEntry.line), ), .FROM_TABLE(SQLiteEntry.self), .WHERE(loggerFilter.whereClause), .ORDER_BY( - .column(SQLiteEntry.date, op: ascending ? .asc : .desc) + .column(SQLiteEntry.date, op: ascending ? .asc : .desc), ), - .LIMIT(Int(x)) + .LIMIT(Int(x)), ) case (.some(let loggerFilter), let x) where x == 0: SQLiteStatement( @@ -118,13 +118,13 @@ final class SQLiteLogProvider: LogProvider { .column(SQLiteEntry.source), .column(SQLiteEntry.file), .column(SQLiteEntry.function), - .column(SQLiteEntry.line) + .column(SQLiteEntry.line), ), .FROM_TABLE(SQLiteEntry.self), .WHERE(loggerFilter.whereClause), .ORDER_BY( - .column(SQLiteEntry.date, op: ascending ? .asc : .desc) - ) + .column(SQLiteEntry.date, op: ascending ? .asc : .desc), + ), ) case (.none, let x) where x > 0: SQLiteStatement( @@ -138,13 +138,13 @@ final class SQLiteLogProvider: LogProvider { .column(SQLiteEntry.source), .column(SQLiteEntry.file), .column(SQLiteEntry.function), - .column(SQLiteEntry.line) + .column(SQLiteEntry.line), ), .FROM_TABLE(SQLiteEntry.self), .ORDER_BY( - .column(SQLiteEntry.date, op: ascending ? .asc : .desc) + .column(SQLiteEntry.date, op: ascending ? .asc : .desc), ), - .LIMIT(Int(x)) + .LIMIT(Int(x)), ) default: SQLiteStatement( @@ -158,12 +158,12 @@ final class SQLiteLogProvider: LogProvider { .column(SQLiteEntry.source), .column(SQLiteEntry.file), .column(SQLiteEntry.function), - .column(SQLiteEntry.line) + .column(SQLiteEntry.line), ), .FROM_TABLE(SQLiteEntry.self), .ORDER_BY( - .column(SQLiteEntry.date, op: ascending ? .asc : .desc) - ) + .column(SQLiteEntry.date, op: ascending ? .asc : .desc), + ), ) } @@ -190,7 +190,7 @@ final class SQLiteLogProvider: LogProvider { source: row[6] as! String, file: row[7] as! String, function: row[8] as! String, - line: Int(row[9] as! Int64) + line: Int(row[9] as! Int64), ) entries.append(Logger.Entry(entry)) @@ -207,12 +207,12 @@ final class SQLiteLogProvider: LogProvider { SQLiteStatement( .DELETE_FROM(SQLiteEntry.self), .WHERE( - filter.whereClause - ) + filter.whereClause, + ), ) } else { SQLiteStatement( - .DELETE_FROM(SQLiteEntry.self) + .DELETE_FROM(SQLiteEntry.self), ) } @@ -235,8 +235,8 @@ extension Connection { let sql = SQLiteStatement( .CREATE( - .SCHEMA(SQLiteEntry.instance, ifNotExists: true) - ) + .SCHEMA(SQLiteEntry.instance, ifNotExists: true), + ), ).render() do { diff --git a/Sources/Occurrence/SwiftUI/LogView.swift b/Sources/Occurrence/SwiftUI/LogView.swift index 451bee4..98fd68a 100644 --- a/Sources/Occurrence/SwiftUI/LogView.swift +++ b/Sources/Occurrence/SwiftUI/LogView.swift @@ -66,7 +66,7 @@ public struct LogView: View { /// - exportAction: Handler to be called when log entries are exported. public init( allowManagement: Bool = true, - exportAction: (([Logger.Entry]) -> Void)? = nil + exportAction: (([Logger.Entry]) -> Void)? = nil, ) { _allowManagement = State(wrappedValue: allowManagement) self.exportAction = exportAction diff --git a/Sources/Occurrence/SwiftUI/PreviewLogProvider.swift b/Sources/Occurrence/SwiftUI/PreviewLogProvider.swift index 045e50b..3e01cc4 100644 --- a/Sources/Occurrence/SwiftUI/PreviewLogProvider.swift +++ b/Sources/Occurrence/SwiftUI/PreviewLogProvider.swift @@ -42,7 +42,7 @@ extension Logger.Entry { source: "", file: "PermissionManager.swift", function: "requestPermissions()", - line: 169 + line: 169, ) static let two = Logger.Entry( @@ -54,7 +54,7 @@ extension Logger.Entry { source: "", file: "AuthenticationManager.swift", function: "checkAuthenticationState()", - line: 65 + line: 65, ) static let three = Logger.Entry( @@ -72,7 +72,7 @@ extension Logger.Entry { source: "", file: "AppDelegate.swift", function: "application(_:didFinishLaunchingWithOptions:)", - line: 24 + line: 24, ) static let four = Logger.Entry( @@ -84,6 +84,6 @@ extension Logger.Entry { source: "", file: "NetworkManager.swift", function: "get(request:)", - line: 402 + line: 402, ) } diff --git a/Tests/OccurrenceTests/LogProviderTestCase.swift b/Tests/OccurrenceTests/LogProviderTestCase.swift index 46fd0a8..f6fec5d 100644 --- a/Tests/OccurrenceTests/LogProviderTestCase.swift +++ b/Tests/OccurrenceTests/LogProviderTestCase.swift @@ -38,7 +38,7 @@ class LogProviderTestCase: XCTestCase { day: 1, hour: 15, minute: 30, - second: 0 + second: 0, ) january1st_1530 = try XCTUnwrap(gregorian.date(from: components)) diff --git a/Tests/OccurrenceTests/LoggableErrorTests.swift b/Tests/OccurrenceTests/LoggableErrorTests.swift index 266706a..311ac25 100644 --- a/Tests/OccurrenceTests/LoggableErrorTests.swift +++ b/Tests/OccurrenceTests/LoggableErrorTests.swift @@ -86,7 +86,7 @@ final class LoggableErrorTests: XCTestCase { let context = EncodingError.Context( codingPath: [Logger.MetadataKey.description, Logger.MetadataKey.file], - debugDescription: "Bad data." + debugDescription: "Bad data.", ) let error = EncodingError.invalidValue(FileRef(), context) let metadata = error.metadata @@ -112,7 +112,7 @@ final class LoggableErrorTests: XCTestCase { func testDecodingErrorConformance() throws { let context = DecodingError.Context( codingPath: [Logger.MetadataKey.code], - debugDescription: "Unexpected type." + debugDescription: "Unexpected type.", ) let error = DecodingError.typeMismatch(Int.self, context) let metadata = error.metadata