From 71197ae760f5d88063905d33ff9a8a9b894a56ad Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sun, 16 Mar 2025 18:39:47 -0400 Subject: [PATCH 1/3] Import Android for isatty --- Sources/swift-format/Utilities/TTY.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Sources/swift-format/Utilities/TTY.swift b/Sources/swift-format/Utilities/TTY.swift index 3097b1611..73a7ffbf8 100644 --- a/Sources/swift-format/Utilities/TTY.swift +++ b/Sources/swift-format/Utilities/TTY.swift @@ -11,6 +11,9 @@ //===----------------------------------------------------------------------===// import Foundation +#if canImport(Android) +import Android +#endif /// Returns a value indicating whether or not the stream is a TTY. func isTTY(_ fileHandle: FileHandle) -> Bool { From a02c632f4096f1ffa69bd4333a8bdc38a1a406e7 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Mon, 17 Mar 2025 09:47:30 -0400 Subject: [PATCH 2/3] Change Android conditional to #if os(Android) --- Sources/swift-format/Utilities/TTY.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/swift-format/Utilities/TTY.swift b/Sources/swift-format/Utilities/TTY.swift index 73a7ffbf8..b56996b0e 100644 --- a/Sources/swift-format/Utilities/TTY.swift +++ b/Sources/swift-format/Utilities/TTY.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -#if canImport(Android) +#if os(Android) import Android #endif From c082ad4e008b5c661411b19b3a4a4976b41873ff Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Mon, 17 Mar 2025 11:20:14 -0400 Subject: [PATCH 3/3] Fix formatting of import --- Sources/swift-format/Utilities/TTY.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/swift-format/Utilities/TTY.swift b/Sources/swift-format/Utilities/TTY.swift index b56996b0e..263770e28 100644 --- a/Sources/swift-format/Utilities/TTY.swift +++ b/Sources/swift-format/Utilities/TTY.swift @@ -11,6 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation + #if os(Android) import Android #endif