diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 209e4973..aa703646 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,7 @@ jobs: - run: ./.github/gh-actions-runner-xcode-select.sh - run: brew install swiftly bash - run: swiftly init --skip-install --assume-yes --verbose && swiftly install + - run: swiftly run swift --version - run: ./build-debug.sh - run: ./test.sh @@ -52,6 +53,7 @@ jobs: - run: ./.github/gh-actions-runner-xcode-select.sh - run: brew install bash fish xcbeautify swiftly - run: swiftly init --skip-install --assume-yes --verbose && swiftly install + - run: swiftly run swift --version - name: './build-release.sh' run: | # "-" means "Sign to run locally". There is no aerospace-codesign-certificate on GH Actions diff --git a/Sources/AppBundle/model/Json.swift b/Sources/AppBundle/model/Json.swift index 9eba9943..27d90a77 100644 --- a/Sources/AppBundle/model/Json.swift +++ b/Sources/AppBundle/model/Json.swift @@ -32,7 +32,7 @@ enum Json: Encodable, Equatable { case let value as [Any?]: .array(value.map(newOrDieRecursive)) default: newScalarOrNil(value) - ?? dieT("Can't parse \(String(describing: value)) (\(Swift::type(of: value))) to JSON") + ?? dieT("Can't parse \(String(describing: value)) (\(Swift.type(of: value))) to JSON") } } diff --git a/Sources/AppBundle/tree/MacApp.swift b/Sources/AppBundle/tree/MacApp.swift index 89937482..7f764d06 100644 --- a/Sources/AppBundle/tree/MacApp.swift +++ b/Sources/AppBundle/tree/MacApp.swift @@ -162,13 +162,13 @@ final class MacApp: AbstractApp { } func getAxRect(_ windowId: UInt32) async throws -> Rect? { - try await withWindow(windowId) { window, job in try AppBundle::getAxRect(window: window, job: job) } + try await withWindow(windowId) { window, job in try AppBundle.getAxRect(window: window, job: job) } } func getAxRectForTermination(_ windowId: UInt32) -> Rect? { let future = CompletableFuture() let job = withWindowAsync(windowId) { window, job in - future.complete(try AppBundle::getAxRect(window: window, job: job)) + future.complete(try AppBundle.getAxRect(window: window, job: job)) } return switch job.isCancelled { case true: nil diff --git a/Sources/AppBundleTests/AxUiElementWindowTypeTest.swift b/Sources/AppBundleTests/AxUiElementWindowTypeTest.swift index 9e2a0fdb..30fdfd8c 100644 --- a/Sources/AppBundleTests/AxUiElementWindowTypeTest.swift +++ b/Sources/AppBundleTests/AxUiElementWindowTypeTest.swift @@ -42,7 +42,7 @@ extension [String: Json]: AxUiElementMock { } if let value = value.rawValue { return attr.getter(value as AnyObject) - ?? dieT("Value \(value) (of type \(Swift::type(of: value))) isn't convertible to \(attr.key)") + ?? dieT("Value \(value) (of type \(Swift.type(of: value))) isn't convertible to \(attr.key)") } else { return nil } diff --git a/Sources/Common/cmdArgs/splitArgs.swift b/Sources/Common/cmdArgs/splitArgs.swift index 7ed3ae37..acd4b863 100644 --- a/Sources/Common/cmdArgs/splitArgs.swift +++ b/Sources/Common/cmdArgs/splitArgs.swift @@ -49,7 +49,7 @@ private enum State { extension [String] { public func joinArgs() -> String { self.map { arg in - lazy var containsWhitespaces = arg.rangeOfCharacter(from: .whitespacesAndNewlines) != nil + let containsWhitespaces = arg.rangeOfCharacter(from: .whitespacesAndNewlines) != nil let containsSingleQuote = arg.contains("'") let containsDoubleQuote = arg.contains("\"") return switch true {