Skip to content

Commit c514e80

Browse files
committed
Update swift-3.0-preview-3-branch to build with Xcode 8 beta 3, OS X 10.12, iOS 10, tvOS 10, and watchOS 3 SDKs.
1 parent c10e5ac commit c514e80

File tree

166 files changed

+802
-1436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+802
-1436
lines changed

CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ option(SWIFT_BUILD_TOOLS
4848
"Build the Swift compiler and other tools"
4949
TRUE)
5050

51-
option(SWIFT_BUILD_REMOTE_MIRROR
52-
"Build the Swift Remote Mirror Library"
53-
TRUE)
54-
5551
option(SWIFT_BUILD_DYNAMIC_STDLIB
5652
"Build dynamic variants of the Swift standard library"
5753
TRUE)
@@ -124,7 +120,7 @@ set(SWIFT_ENABLE_GOLD_LINKER FALSE CACHE BOOL
124120
"Enable using the gold linker when available")
125121

126122
set(_SWIFT_KNOWN_INSTALL_COMPONENTS
127-
"autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
123+
"autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror-headers")
128124

129125
# Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D
130126
set(SWIFT_INSTALL_COMPONENTS "${_SWIFT_KNOWN_INSTALL_COMPONENTS}" CACHE STRING

apinotes/AVFoundation.apinotes

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,3 @@ Functions:
243243
Enumerators:
244244
- Name: AVMovieWritingAddMovieHeaderToDestination
245245
SwiftName: addMovieHeaderToDestination
246-
- Name: AVMusicSequenceLoadSMF_ChannelsToTracks
247-
SwiftName: smfChannelsToTracks
248-
Tags:
249-
- Name: AVError
250-
NSErrorDomain: AVFoundationErrorDomain

apinotes/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,16 @@ set(SWIFT_API_NOTES_INPUTS
22
AVFoundation
33
AppKit
44
AudioToolbox
5-
CallKit
65
CloudKit
7-
CoreBluetooth
86
CoreData
97
CoreGraphics
108
CoreLocation
119
CoreText
1210
Dispatch
13-
EventKit
1411
Foundation
1512
GameKit
1613
HomeKit
17-
Intents
18-
LocalAuthentication
1914
MediaPlayer
20-
Metal
21-
MultipeerConnectivity
2215
NotificationCenter
2316
ObjectiveC
2417
PassKit
@@ -29,7 +22,6 @@ set(SWIFT_API_NOTES_INPUTS
2922
TVMLKit
3023
TVServices
3124
UIKit
32-
WatchConnectivity
3325
WatchKit
3426
WebKit
3527
XCTest

apinotes/CallKit.apinotes

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

apinotes/CloudKit.apinotes

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,3 @@ Classes:
4444
- Selector: 'setParentReferenceFromRecordID:'
4545
MethodKind: Instance
4646
SwiftName: 'setParent(_:)'
47-
Tags:
48-
- Name: CKErrorCode
49-
NSErrorDomain: CKErrorDomain

apinotes/Contacts.swift

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

apinotes/CoreBluetooth.apinotes

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

apinotes/CoreLocation.apinotes

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,3 @@ Protocols:
2020
- Selector: 'locationManager:didChangeAuthorizationStatus:'
2121
SwiftName: 'locationManager(_:didChangeAuthorization:)'
2222
MethodKind: Instance
23-
Tags:
24-
- Name: CLError
25-
NSErrorDomain: kCLErrorDomain

apinotes/EventKit.apinotes

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

apinotes/Foundation.apinotes

Lines changed: 20 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -476,10 +476,7 @@ Classes:
476476
SwiftName: intValue
477477
- Name: unsignedIntegerValue
478478
SwiftName: uintValue
479-
- Name: NSAttributedString
480-
SwiftName: NSAttributedString
481479
- Name: NSOrderedSet
482-
SwiftName: NSOrderedSet
483480
Methods:
484481
- Selector: 'enumerateObjectsWithOptions:usingBlock:'
485482
SwiftName: enumerateObjects(options:using:)
@@ -585,57 +582,40 @@ Classes:
585582
SwiftName: NSXPCListenerEndpoint
586583
- Name: NSAppleScript
587584
SwiftName: NSAppleScript
588-
- Name: NSBundleResourceRequest
589-
SwiftName: NSBundleResourceRequest
590585
- Name: NSBundle
591586
Methods:
592587
- Selector: 'URLForAuxiliaryExecutable:'
593-
SwiftName: url(forAuxiliaryExecutable:)
588+
SwiftName: urlForAuxiliaryExecutable(_:)
594589
MethodKind: Instance
595590
- Selector: 'pathForAuxiliaryExecutable:'
596-
SwiftName: path(forAuxiliaryExecutable:)
591+
SwiftName: pathForAuxiliaryExecutable(_:)
597592
MethodKind: Instance
598593
- Selector: 'URLForResource:withExtension:subdirectory:inBundleWithURL:'
599-
SwiftName: url(forResource:withExtension:subdirectory:in:)
600-
MethodKind: Class
601-
- Selector: 'URLsForResourcesWithExtension:subdirectory:inBundleWithURL:'
602-
SwiftName: urls(forResourcesWithExtension:subdirectory:in:)
594+
SwiftName: urlForResource(_:withExtension:subdirectory:inBundleWith:)
603595
MethodKind: Class
604596
- Selector: 'URLForResource:withExtension:'
605-
SwiftName: url(forResource:withExtension:)
597+
SwiftName: urlForResource(_:withExtension:)
606598
MethodKind: Instance
607599
- Selector: 'URLForResource:withExtension:subdirectory:'
608-
SwiftName: url(forResource:withExtension:subdirectory:)
609-
MethodKind: Instance
610-
- Selector: 'URLsForResourcesWithExtension:subdirectory:'
611-
SwiftName: urls(forResourcesWithExtension:subdirectory:)
600+
SwiftName: urlForResource(_:withExtension:subdirectory:)
612601
MethodKind: Instance
613-
- Selector: 'URLsForResourcesWithExtension:subdirectory:localization:'
614-
SwiftName: urls(forResourcesWithExtension:subdirectory:localization:)
602+
- Selector: 'URLForResource:withExtension:subdirectory:localization:'
603+
SwiftName: urlForResource(_:withExtension:subdirectory:localization:)
615604
MethodKind: Instance
616605
- Selector: 'pathForResource:ofType:inDirectory:'
617-
SwiftName: path(forResource:ofType:inDirectory:)
618-
MethodKind: Class
619-
- Selector: 'pathsForResourcesOfType:inDirectory:'
620-
SwiftName: paths(forResourcesOfType:inDirectory:)
606+
SwiftName: pathForResource(_:ofType:inDirectory:)
621607
MethodKind: Class
622608
- Selector: 'pathForResource:ofType:'
623-
SwiftName: path(forResource:ofType:)
609+
SwiftName: pathForResource(_:ofType:)
624610
MethodKind: Instance
625611
- Selector: 'pathForResource:ofType:inDirectory:'
626-
SwiftName: path(forResource:ofType:inDirectory:)
612+
SwiftName: pathForResource(_:ofType:inDirectory:)
627613
MethodKind: Instance
628614
- Selector: 'pathForResource:ofType:inDirectory:forLocalization:'
629-
SwiftName: path(forResource:ofType:inDirectory:forLocalization:)
630-
MethodKind: Instance
631-
- Selector: 'pathsForResourcesOfType:inDirectory:'
632-
SwiftName: paths(forResourcesOfType:inDirectory:)
633-
MethodKind: Instance
634-
- Selector: 'pathsForResourcesOfType:inDirectory:forLocalization:'
635-
SwiftName: paths(forResourcesOfType:inDirectory:forLocalization:)
615+
SwiftName: pathForResource(_:ofType:inDirectory:forLocalization:)
636616
MethodKind: Instance
637617
- Selector: 'objectForInfoDictionaryKey:'
638-
SwiftName: object(forInfoDictionaryKey:)
618+
SwiftName: objectForInfoDictionaryKey(_:)
639619
MethodKind: Instance
640620
- Name: NSByteCountFormatter
641621
Methods:
@@ -730,19 +710,16 @@ Classes:
730710
SwiftName: mountedVolumeURLs(includingResourceValuesForKeys:options:)
731711
MethodKind: Instance
732712
- Selector: 'URLsForDirectory:inDomains:'
733-
SwiftName: urls(for:in:)
713+
SwiftName: urlsForDirectory(_:inDomains:)
734714
MethodKind: Instance
735715
- Selector: 'URLForDirectory:inDomain:appropriateForURL:create:error:'
736-
SwiftName: url(for:in:appropriateFor:create:)
716+
SwiftName: urlForDirectory(_:in:appropriateFor:create:)
737717
MethodKind: Instance
738718
- Selector: 'URLForUbiquityContainerIdentifier:'
739-
SwiftName: url(forUbiquityContainerIdentifier:)
719+
SwiftName: urlForUbiquityContainerIdentifier(_:)
740720
MethodKind: Instance
741721
- Selector: 'containerURLForSecurityApplicationGroupIdentifier:'
742-
SwiftName: containerURL(forSecurityApplicationGroupIdentifier:)
743-
MethodKind: Instance
744-
- Selector: 'URLForPublishingUbiquitousItemAtURL:expirationDate:error:'
745-
SwiftName: url(forPublishingUbiquitousItemAt:expiration:)
722+
SwiftName: containerURLForSecurityApplicationGroupIdentifier(_:)
746723
MethodKind: Instance
747724
- Name: NSFileVersion
748725
SwiftName: NSFileVersion
@@ -819,9 +796,6 @@ Classes:
819796
MethodKind: Instance
820797
- Name: NSTextCheckingResult
821798
Methods:
822-
- Selector: 'rangeAtIndex:'
823-
SwiftName: rangeAt(_:)
824-
MethodKind: Instance
825799
- Selector: 'resultByAdjustingRangesWithOffset:'
826800
SwiftName: resultByAdjustingRangesWithOffset(_:)
827801
MethodKind: Instance
@@ -946,9 +920,6 @@ Classes:
946920
- Selector: 'setBool:forKey:'
947921
SwiftName: set(_:forKey:)
948922
MethodKind: Instance
949-
- Selector: 'setURL:forKey:'
950-
SwiftName: set(_:forKey:)
951-
MethodKind: Instance
952923
- Selector: 'addSuiteNamed:'
953924
SwiftName: addSuite(named:)
954925
MethodKind: Instance
@@ -1207,7 +1178,7 @@ Tags:
12071178
- Name: NSXMLDocumentContentKind
12081179
SwiftName: XMLDocument.ContentKind
12091180
- Name: NSXMLDTDNodeKind
1210-
SwiftName: XMLDTDNode.DTDKind
1181+
SwiftName: XMLDTDNode.Kind
12111182
- Name: NSXMLNodeKind
12121183
SwiftName: XMLNode.Kind
12131184
- Name: NSXMLParserError
@@ -1229,7 +1200,7 @@ Tags:
12291200
- Name: NSCalculationError
12301201
SwiftName: NSDecimalNumber.CalculationError
12311202
- Name: NSAttributedStringEnumerationOptions
1232-
SwiftName: NSAttributedString.EnumerationOptions
1203+
SwiftName: AttributedString.EnumerationOptions
12331204
- Name: NSDateComponentsFormatterUnitsStyle
12341205
SwiftName: DateComponentsFormatter.UnitsStyle
12351206
- Name: NSDateComponentsFormatterZeroFormattingBehavior
@@ -1254,6 +1225,8 @@ Tags:
12541225
SwiftName: NSString.EnumerationOptions
12551226
- Name: NSURLBookmarkCreationOptions
12561227
SwiftName: NSURL.BookmarkCreationOptions
1228+
- Name: NSURLBookmarkFileCreationOptions
1229+
SwiftName: NSURL.BookmarkFileCreationOptions
12571230
- Name: NSURLBookmarkResolutionOptions
12581231
SwiftName: NSURL.BookmarkResolutionOptions
12591232
- Name: NSURLHandleStatus
@@ -1349,8 +1322,6 @@ Typedefs:
13491322
SwiftName: DistributedNotificationCenter.CenterType
13501323
- Name: NSURLFileProtectionType
13511324
SwiftName: URLFileProtection
1352-
- Name: NSURLBookmarkFileCreationOptions
1353-
SwiftName: NSURL.BookmarkFileCreationOptions
13541325
Globals:
13551326
- Name: NSAppleScriptErrorMessage
13561327
SwiftName: NSAppleScript.errorMessage

0 commit comments

Comments
 (0)