diff --git a/Package.swift b/Package.swift index bb8a507..2958ed9 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.4 // // Package.swift // Conduit @@ -23,6 +23,6 @@ let package = Package( dependencies : [], targets: [ .target(name: "Conduit", dependencies: []), - .testTarget(name: "ConduitTests", dependencies: ["Conduit"]), + .testTarget(name: "ConduitTests", dependencies: ["Conduit"], resources: [.process("Resources")]), ] ) diff --git a/Sources/Conduit/ConduitLogger.swift b/Sources/Conduit/ConduitLogger.swift index ec1a457..a392613 100644 --- a/Sources/Conduit/ConduitLogger.swift +++ b/Sources/Conduit/ConduitLogger.swift @@ -65,23 +65,23 @@ public protocol ConduitLoggerType { } extension ConduitLoggerType { - func verbose(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) { + func verbose(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) { log(block(), level: .verbose, function: function, filePath: filePath, line: line) } - func debug(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) { + func debug(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) { log(block(), level: .debug, function: function, filePath: filePath, line: line) } - func info(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) { + func info(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) { log(block(), level: .info, function: function, filePath: filePath, line: line) } - func warn(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) { + func warn(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) { log(block(), level: .warn, function: function, filePath: filePath, line: line) } - func error(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #file, line: Int = #line) { + func error(_ block: @autoclosure () -> Any, function: String = #function, filePath: String = #fileID, line: Int = #line) { log(block(), level: .error, function: function, filePath: filePath, line: line) } diff --git a/Tests/ConduitTests/Resource.swift b/Tests/ConduitTests/Resource.swift index 7c017df..ee9f7bf 100644 --- a/Tests/ConduitTests/Resource.swift +++ b/Tests/ConduitTests/Resource.swift @@ -25,10 +25,9 @@ struct Resource { var path: URL { let filename: String = type.isEmpty ? name : "\(name).\(type)" - return URL(fileURLWithPath: #file) - .deletingLastPathComponent() - .appendingPathComponent("Resources") - .appendingPathComponent(filename) + let bundle = Bundle.module + let path = bundle.path(forResource: filename, ofType: nil) ?? "" + return URL(fileURLWithPath: path) } }