From e11690ecb465f7cc5a9baced8eda520a5b4e89eb Mon Sep 17 00:00:00 2001 From: Norio Nomura Date: Mon, 5 Feb 2018 13:59:10 +0900 Subject: [PATCH] `ObjCBool` is no longer implicitly converted to `Bool` on Linux --- .../SwiftLintFramework/Extensions/Configuration+Merging.swift | 2 +- Source/SwiftLintFramework/Extensions/String+SwiftLint.swift | 2 +- Source/SwiftLintFramework/Models/Configuration.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/SwiftLintFramework/Extensions/Configuration+Merging.swift b/Source/SwiftLintFramework/Extensions/Configuration+Merging.swift index 1efd17be3..4322c8aa0 100644 --- a/Source/SwiftLintFramework/Extensions/Configuration+Merging.swift +++ b/Source/SwiftLintFramework/Extensions/Configuration+Merging.swift @@ -54,7 +54,7 @@ extension Configuration { } let isDirectory: Bool - #if os(Linux) + #if os(Linux) && (!swift(>=4.1) || (!swift(>=4.0) && swift(>=3.3))) isDirectory = isDirectoryObjC #else isDirectory = isDirectoryObjC.boolValue diff --git a/Source/SwiftLintFramework/Extensions/String+SwiftLint.swift b/Source/SwiftLintFramework/Extensions/String+SwiftLint.swift index 3d3ee5580..8b28f7f62 100644 --- a/Source/SwiftLintFramework/Extensions/String+SwiftLint.swift +++ b/Source/SwiftLintFramework/Extensions/String+SwiftLint.swift @@ -86,7 +86,7 @@ extension String { internal var isFile: Bool { var isDirectoryObjC: ObjCBool = false if FileManager.default.fileExists(atPath: self, isDirectory: &isDirectoryObjC) { - #if os(Linux) + #if os(Linux) && (!swift(>=4.1) || (!swift(>=4.0) && swift(>=3.3))) return !isDirectoryObjC #else return !isDirectoryObjC.boolValue diff --git a/Source/SwiftLintFramework/Models/Configuration.swift b/Source/SwiftLintFramework/Models/Configuration.swift index 4b8e198f5..11516fa2c 100644 --- a/Source/SwiftLintFramework/Models/Configuration.swift +++ b/Source/SwiftLintFramework/Models/Configuration.swift @@ -264,7 +264,7 @@ private extension String { func isDirectory() -> Bool { var isDir: ObjCBool = false if FileManager.default.fileExists(atPath: self, isDirectory: &isDir) { - #if os(Linux) + #if os(Linux) && (!swift(>=4.1) || (!swift(>=4.0) && swift(>=3.3))) return isDir #else return isDir.boolValue