Merge remote-tracking branch 'origin/master' into swift-4.1-branch

swift-ci · swift-ci · commit 05dbce8ab1f0 · 2017-11-28T02:21:50.000-08:00
diff --git a/Foundation/NSNotification.swift b/Foundation/NSNotification.swift
@@ -188,7 +188,7 @@ open class NotificationCenter: NSObject {
         })
     }
 
-    @available(*,obsoleted:4.0,renamed:"addObserver(forName:object:queue:using:)")
+    @available(*, unavailable, renamed: "addObserver(forName:object:queue:using:)")
     open func addObserver(forName name: NSNotification.Name?, object obj: Any?, queue: OperationQueue?, usingBlock block: @escaping (Notification) -> Void) -> NSObjectProtocol {
         return addObserver(forName: name, object: obj, queue: queue, using: block)
     }

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ open class NotificationCenter: NSObject {`
`188`	`188`	`})`
`189`	`189`	`}`
`190`	`190`
`191`		`- @available(*,obsoleted:4.0,renamed:"addObserver(forName:object:queue:using:)")`
	`191`	`+ @available(*, unavailable, renamed: "addObserver(forName:object:queue:using:)")`
`192`	`192`	`open func addObserver(forName name: NSNotification.Name?, object obj: Any?, queue: OperationQueue?, usingBlock block: @escaping (Notification) -> Void) -> NSObjectProtocol {`
`193`	`193`	`return addObserver(forName: name, object: obj, queue: queue, using: block)`
`194`	`194`	`}`