Skip to content

Fix macOS deprecated API #3

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

Merged
merged 2 commits into from
Nov 2, 2021
Merged

Fix macOS deprecated API #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3253b3f
Fix deprecated readDataToEndOfFile API
Kyle-Ye Oct 17, 2021
90619fc
Fix deprecated launch and launchPath API on Process
Kyle-Ye Oct 28, 2021
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
9 changes: 7 additions & 2 deletions Sources/markdown-tool/Commands/FormatCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,16 @@ extension MarkdownCommand {
/// Search for the an executable with a given base name.
func findExecutable(named name: String) throws -> String? {
let which = Process()
which.launchPath = "/usr/bin/which"
which.arguments = [name]
let standardOutput = Pipe()
which.standardOutput = standardOutput
which.launch()
if #available(macOS 10.13, *) {
which.executableURL = URL(fileURLWithPath: "/usr/bin/which")
try which.run()
} else {
which.launchPath = "/usr/bin/which"
which.launch()
}
which.waitUntilExit()

guard which.terminationStatus == 0,
Expand Down
9 changes: 7 additions & 2 deletions Sources/markdown-tool/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,20 @@ struct MarkdownCommand: ParsableCommand {
])

static func parseFile(at path: String, options: ParseOptions) throws -> (source: String, parsed: Document) {
let data = try Data(contentsOf: URL( fileURLWithPath: path))
let data = try Data(contentsOf: URL(fileURLWithPath: path))
guard let inputString = String(data: data, encoding: .utf8) else {
throw Error.couldntDecodeInputAsUTF8
}
return (inputString, Document(parsing: inputString, options: options))
}

static func parseStandardInput(options: ParseOptions) throws -> (source: String, parsed: Document) {
let stdinData = FileHandle.standardInput.readDataToEndOfFile()
let stdinData: Data
if #available(macOS 10.15.4, *) {
stdinData = try FileHandle.standardInput.readToEnd() ?? Data()
} else {
stdinData = FileHandle.standardInput.readDataToEndOfFile()
}
guard let stdinString = String(data: stdinData, encoding: .utf8) else {
throw Error.couldntDecodeInputAsUTF8
}
Expand Down