Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

T 1250801: Conduit library Enhance Security by Removing #file Usage #167

Merged
merged 2 commits into from
Sep 15, 2023
Merged

T 1250801: Conduit library Enhance Security by Removing #file Usage #167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1a5729
T 1250801: Conduit library Enhance Security by Removing `#file` Usage
AnshulMindbody Sep 13, 2023
4587fa4
updated the swift-tools-version:5.4 and path
AnshulMindbody Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Sources/Conduit/ConduitLogger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion Tests/ConduitTests/Resource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct Resource {

var path: URL {
let filename: String = type.isEmpty ? name : "\(name).\(type)"
return URL(fileURLWithPath: #file)
return URL(fileURLWithPath: #fileID)
.deletingLastPathComponent()
.appendingPathComponent("Resources")
.appendingPathComponent(filename)
Expand Down
Loading