Limit usage of CoreFoundation to macOS (swiftlang#414)

Author: owenv

Sources/SWBCore/ProjectModel/FileTextEncoding.swift

@@ -19,7 +19,7 @@ public import struct Foundation.Data
 public import class Foundation.NSNumber
 public import class Foundation.NSString
 
-#if canImport(CoreFoundation)
+#if canImport(Darwin)
 import class CoreFoundation.CFString
 import var CoreFoundation.kCFStringEncodingInvalidId
 import func CoreFoundation.CFStringConvertEncodingToNSStringEncoding
@@ -38,7 +38,7 @@ public import struct Foundation.StringEncodingDetectionOptionsKey
 // encodings (except UTF-8) DO add a BOM based on the host byte order. Be aware.
 public extension FileTextEncoding {
     init?(stringEncoding: String.Encoding) {
-        #if canImport(CoreFoundation)
+        #if canImport(Darwin)
         let cfencoding = CFStringConvertNSStringEncodingToEncoding(stringEncoding.rawValue)
         if cfencoding != kCFStringEncodingInvalidId, let name = CFStringConvertEncodingToIANACharSetName(cfencoding).map(String.init) {
             self.init(name)
@@ -50,7 +50,7 @@ public extension FileTextEncoding {
 
     /// Convert the given encoding to an `NSStringEncoding`.
     var stringEncoding: String.Encoding? {
-        #if canImport(CoreFoundation)
+        #if canImport(Darwin)
         let cfencoding = CFStringConvertIANACharSetNameToEncoding(rawValue.asCFString)
         if cfencoding != kCFStringEncodingInvalidId {
             return String.Encoding(rawValue: CFStringConvertEncodingToNSStringEncoding(cfencoding))

Sources/SWBUtil/Lock.swift

@@ -10,18 +10,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-private import SWBLibc
+#if canImport(os)
+public import os
+#elseif os(Windows)
+public import WinSDK
+#else
+public import SWBLibc
+#endif
 
 // FIXME: Replace the contents of this file with the Swift standard library's Mutex type once it's available everywhere we deploy.
 
 /// A more efficient lock than a DispatchQueue (esp. under contention).
 #if canImport(os)
-public import os
 public typealias Lock = OSAllocatedUnfairLock
 #else
-#if os(Windows)
-public import WinSDK
-#endif
 public final class Lock: @unchecked Sendable {
     #if os(Windows)
     @usableFromInline

Sources/SWBUtil/PropertyList.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if canImport(CoreFoundation)
+#if canImport(Darwin)
 import class CoreFoundation.CFBoolean
 import func CoreFoundation.CFBooleanGetTypeID
 import func CoreFoundation.CFBooleanGetValue
@@ -68,7 +68,7 @@ extension PropertyListConversionError: CustomStringConvertible {
 }
 
 public struct OpaquePropertyListItem: Equatable, Hashable, @unchecked Sendable {
-#if canImport(CoreFoundation)
+#if canImport(Darwin)
     fileprivate var wrappedValue: CFTypeRef
 
     fileprivate init(_ wrappedValue: CFTypeRef) {
@@ -639,7 +639,7 @@ extension PropertyListItem: Equatable {
 
 private func convertToPropertyListItem(_ item: Any) -> PropertyListItem {
     switch(item) {
-#if canImport(CoreFoundation)
+#if canImport(Darwin)
     case let asBool as CFBoolean where CFGetTypeID(asBool) == CFBooleanGetTypeID():
         return .plBool(CFBooleanGetValue(asBool))
 
@@ -683,7 +683,7 @@ private func convertToPropertyListItem(_ item: Any) -> PropertyListItem {
         }
         return .plDict(result)
 
-#if canImport(CoreFoundation)
+#if canImport(Darwin)
     case let asCFType as CFTypeRef:
         return .plOpaque(.init(asCFType))
 #else

Sources/SWBUtil/String.swift

@@ -768,7 +768,7 @@ fileprivate struct BinaryDataIterator<C, T: UnsignedInteger & FixedWidthInteger>
     }
 }
 
-#if canImport(CoreFoundation)
+#if canImport(Darwin)
 public import class CoreFoundation.CFString
 public import enum CoreFoundation.CFStringBuiltInEncodings
 public import func CoreFoundation.CFStringCreateWithCString

Tests/SWBCoreTests/FileTextEncodingTests.swift

@@ -26,7 +26,8 @@ import SWBTestSupport
         #expect(FileTextEncoding("utf8") != FileTextEncoding.utf8)
     }
 
-    @Test(.skipHostOS(.windows, "feature not available on Windows due to missing CF APIs"))
+    @Test(.skipHostOS(.windows, "feature not available on Windows due to missing CF APIs"),
+          .skipHostOS(.linux, "feature not available on Linux due to missing CF APIs"))
     func encoding() throws {
         #expect(FileTextEncoding.utf8.stringEncoding == String.Encoding.utf8)
         #expect(FileTextEncoding.utf16.stringEncoding == String.Encoding.utf16)