Add check on tvOS version too #591

OAuthSwift · Apr 30, 2020 · 0a5d252 · 0a5d252
1 parent 3430e76
commit 0a5d252
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Demo/Common/ViewController.swift b/Demo/Common/ViewController.swift
@@ -1554,7 +1554,7 @@ extension ViewController {
             return OAuthSwiftOpenURLExternally.sharedInstance
         case .asWeb:
             #if os(iOS)
-            if #available(iOS 13.0, *) {
+            if #available(iOS 13.0, tvOS 13.0, *) {
                 return ASWebAuthenticationURLHandler(callbackUrlScheme: "oauth-swift://oauth-callback/", presentationContextProvider: self)
             }
             #endif
@@ -1678,7 +1678,7 @@ import SafariServices
 #if canImport(AuthenticationServices)
 import AuthenticationServices
 #endif
-@available(iOS 13.0, macCatalyst 13.0, *)
+@available(iOS 13.0, tvOS 13.0, macCatalyst 13.0, *)
 extension ViewController: ASWebAuthenticationPresentationContextProviding {
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
         return UIApplication.shared.topWindow ?? ASPresentationAnchor()

diff --git a/Sources/Handler/ASWebAuthenticationURLHandler.swift b/Sources/Handler/ASWebAuthenticationURLHandler.swift
@@ -13,7 +13,7 @@ import SafariServices
 import AuthenticationServices
 #endif
 
-@available(iOS 13.0, macCatalyst 13.0, *)
+@available(iOS 13.0, tvOS 13.0, macCatalyst 13.0, *)
 open class ASWebAuthenticationURLHandler: OAuthSwiftURLHandlerType {
     var webAuthSession: ASWebAuthenticationSession!
     let prefersEphemeralWebBrowserSession: Bool

diff --git a/Sources/Handler/OAuthSwiftOpenURLExternally.swift b/Sources/Handler/OAuthSwiftOpenURLExternally.swift
@@ -24,7 +24,7 @@ open class OAuthSwiftOpenURLExternally: OAuthSwiftURLHandlerType {
     @objc open func handle(_ url: URL) {
         #if os(iOS) || os(tvOS)
         #if !OAUTH_APP_EXTENSIONS
-        if #available(iOS 10.0, *) {
+        if #available(iOS 10.0, tvOS 10.0, *) {
             UIApplication.shared.open(url)
         } else {
             UIApplication.shared.openURL(url)

diff --git a/Sources/String+OAuthSwift.swift b/Sources/String+OAuthSwift.swift
@@ -54,7 +54,7 @@ extension String {
         let scanner = Scanner(string: string)
 
         while !scanner.isAtEnd {
-            if #available(iOS 13.0, OSX 10.15, watchOS 6.0, *) {
+            if #available(iOS 13.0, tvOS 13.0, OSX 10.15, watchOS 6.0, *) {
                 let key = scanner.scanUpToString(keyValueSeparator)
                 _ = scanner.scanString(keyValueSeparator)
 

diff --git a/Sources/UIApplication+OAuthSwift.swift b/Sources/UIApplication+OAuthSwift.swift
@@ -18,19 +18,19 @@
             #endif
         }
 
-        @available(iOS 13.0, *)
+        @available(iOS 13.0, tvOS 13.0, *)
         public var connectedWindowScenes: [UIWindowScene] {
             return self.connectedScenes.compactMap { $0 as? UIWindowScene }
         }
 
-        @available(iOS 13.0, *)
+        @available(iOS 13.0, tvOS 13.0, *)
         public var topWindowScene: UIWindowScene? {
             let scenes = connectedWindowScenes
             return scenes.filter { $0.activationState == .foregroundActive }.first ?? scenes.first
         }
 
         public var topWindow: UIWindow? {
-            if #available(iOS 13.0, *) {
+            if #available(iOS 13.0, tvOS 13.0, *) {
                 return self.topWindowScene?.windows.first
             } else {
                 return self.keyWindow