Skip to content

Commit dc395a1

Browse files
committed
Replace objc version of getSystemVersionPlistProperty with swift version
The comment in the function said: // This function is implemented in Objective-C because Swift does not support // failing initializers. which hasn't been true since swift 1.1.
1 parent 2d21059 commit dc395a1

File tree

3 files changed

+2
-47
lines changed

3 files changed

+2
-47
lines changed

stdlib/private/StdlibUnittest/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
2929
StringConvertible.swift
3030
TestHelpers.swift
3131
TypeIndexed.swift
32-
GetOSVersion.mm
3332

3433
SWIFT_MODULE_DEPENDS SwiftPrivate SwiftPrivateThreadExtras SwiftPrivateLibcExtras
3534
SWIFT_MODULE_DEPENDS_IOS Darwin Foundation

stdlib/private/StdlibUnittest/GetOSVersion.mm

Lines changed: 0 additions & 38 deletions
This file was deleted.

stdlib/private/StdlibUnittest/StdlibUnittest.swift

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import SwiftPrivateThreadExtras
1616
import SwiftPrivateLibcExtras
1717

1818
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
19+
import Foundation
1920
import Darwin
2021
#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
2122
import Glibc
@@ -1712,15 +1713,8 @@ public final class TestSuite {
17121713
}
17131714

17141715
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
1715-
@_silgen_name("getSystemVersionPlistProperty")
1716-
func _getSystemVersionPlistPropertyImpl(
1717-
_ propertyName: UnsafePointer<CChar>) -> UnsafePointer<CChar>?
1718-
17191716
func _getSystemVersionPlistProperty(_ propertyName: String) -> String? {
1720-
let cs = _getSystemVersionPlistPropertyImpl(propertyName)
1721-
let str = cs.map(String.init(cString:))
1722-
free(UnsafeMutableRawPointer(mutating: cs))
1723-
return str
1717+
return NSDictionary(contentsOfFile: "/System/Library/CoreServices/SystemVersion.plist")?[propertyName] as? String
17241718
}
17251719
#endif
17261720

0 commit comments

Comments
 (0)