diff --git a/Package.swift b/Package.swift index ad2b06a..658fa4f 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( name: "FaultOrdering", - platforms: [.iOS(.v17)], + platforms: [.iOS(.v17), .macOS(.v13)], products: [ .library(name: "FaultOrdering", type: .dynamic, targets: ["FaultOrdering"]), .library(name: "FaultOrderingTests", targets: ["FaultOrderingTests"]), diff --git a/Sources/EMGFaultOrdering/EMGObjCHelper.m b/Sources/EMGFaultOrdering/EMGObjCHelper.m index bc56ba7..84f7cff 100644 --- a/Sources/EMGFaultOrdering/EMGObjCHelper.m +++ b/Sources/EMGFaultOrdering/EMGObjCHelper.m @@ -5,7 +5,11 @@ // Created by Noah Martin on 5/17/25. // +#if TARGET_OS_IOS @import UIKit; +#elif TARGET_OS_OSX +@import AppKit; +#endif @import FaultOrderingSwift; #import "EMGObjCHelper.h" @@ -13,7 +17,7 @@ @implementation EMGObjCHelper + (NSObject*)startServerWithCallback:(NSData* (^)())callback { - return [[EMGServer alloc] initWithCallback:callback]; + return [[EMGServer alloc] initWithCallback:callback]; } @end diff --git a/Sources/FaultOrderingTests/FaultOrderingTest.swift b/Sources/FaultOrderingTests/FaultOrderingTest.swift index a49b93c..40804cd 100644 --- a/Sources/FaultOrderingTests/FaultOrderingTest.swift +++ b/Sources/FaultOrderingTests/FaultOrderingTest.swift @@ -50,7 +50,7 @@ public class FaultOrderingTest { private func getUsedAddresses(app: XCUIApplication, addresses: [Int]) -> Result { let data = try! JSONEncoder().encode(addresses) // Make the linkmap available to the app - let s = Server(callback: { return data }) + _ = Server(callback: { return data }) // Launch the app for setup var launchEnvironment = app.launchEnvironment diff --git a/Sources/FaultOrderingTests/Linkmap.swift b/Sources/FaultOrderingTests/Linkmap.swift index 3d23f93..dc119c5 100644 --- a/Sources/FaultOrderingTests/Linkmap.swift +++ b/Sources/FaultOrderingTests/Linkmap.swift @@ -77,7 +77,7 @@ func getLinkmap() throws -> [Int: Symbol] { continue } - var components = line.split(separator: "\t", maxSplits: 2).map(String.init) + let components = line.split(separator: "\t", maxSplits: 2).map(String.init) guard components.count == 3 else { continue } @@ -107,7 +107,7 @@ func getLinkmap() throws -> [Int: Symbol] { } } else if inSections { if line.contains("__TEXT\t__text") { - var components = line.split(separator: "\t", maxSplits: 2).map(String.init) + let components = line.split(separator: "\t", maxSplits: 2).map(String.init) guard components.count == 3 else { continue } @@ -115,10 +115,10 @@ func getLinkmap() throws -> [Int: Symbol] { textSectionSize = UInt64(components[1].dropFirst(2), radix: 16) ?? 0 } } else if inObjectFiles { - if let bracketIndex = line.index(of: "]") { + if let bracketIndex = line.firstIndex(of: "]") { let line = line[line.index(bracketIndex, offsetBy: 2)...] if let match = try? /^(.*?)(?:\((.*)\))?$/.firstMatch(in: line) { - if let file = match.2.map { String($0) } { + if let file = match.2.map({ String($0) }) { objects.append(ObjectFile(file: file, library: String(match.1))) } else { objects.append(ObjectFile(file: String(match.1), library: nil))