From 629fbc876a60d20439cba00aa3ff7c0354b0a139 Mon Sep 17 00:00:00 2001 From: Bin Hua Date: Mon, 5 Jul 2021 12:16:09 +0800 Subject: [PATCH 1/3] fixed bugs --- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ SwiftWebVC/SwiftModalWebVC.swift | 2 +- SwiftWebVC/SwiftWebVC.swift | 14 +++++++------- SwiftWebVC/SwiftWebVCActivity.swift | 4 ++-- SwiftWebVC/SwiftWebVCActivityChrome.swift | 4 ++-- 5 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 Example/SwiftWebVCExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Example/SwiftWebVCExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/SwiftWebVCExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Example/SwiftWebVCExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SwiftWebVC/SwiftModalWebVC.swift b/SwiftWebVC/SwiftModalWebVC.swift index 22ff7ef..eb9d765 100755 --- a/SwiftWebVC/SwiftModalWebVC.swift +++ b/SwiftWebVC/SwiftModalWebVC.swift @@ -46,7 +46,7 @@ public class SwiftModalWebVC: UINavigationController { let dismissButtonImageName = (dismissButtonStyle == .arrow) ? "SwiftWebVCDismiss" : "SwiftWebVCDismissAlt" let doneButton = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: dismissButtonImageName), - style: UIBarButtonItemStyle.plain, + style: UIBarButtonItem.Style.plain, target: webViewController, action: #selector(SwiftWebVC.doneButtonTapped)) diff --git a/SwiftWebVC/SwiftWebVC.swift b/SwiftWebVC/SwiftWebVC.swift index 584e273..2d98e65 100755 --- a/SwiftWebVC/SwiftWebVC.swift +++ b/SwiftWebVC/SwiftWebVC.swift @@ -23,7 +23,7 @@ public class SwiftWebVC: UIViewController { lazy var backBarButtonItem: UIBarButtonItem = { var tempBackBarButtonItem = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: "SwiftWebVCBack"), - style: UIBarButtonItemStyle.plain, + style: UIBarButtonItem.Style.plain, target: self, action: #selector(SwiftWebVC.goBackTapped(_:))) tempBackBarButtonItem.width = 18.0 @@ -33,7 +33,7 @@ public class SwiftWebVC: UIViewController { lazy var forwardBarButtonItem: UIBarButtonItem = { var tempForwardBarButtonItem = UIBarButtonItem(image: SwiftWebVC.bundledImage(named: "SwiftWebVCNext"), - style: UIBarButtonItemStyle.plain, + style: UIBarButtonItem.Style.plain, target: self, action: #selector(SwiftWebVC.goForwardTapped(_:))) tempForwardBarButtonItem.width = 18.0 @@ -42,7 +42,7 @@ public class SwiftWebVC: UIViewController { }() lazy var refreshBarButtonItem: UIBarButtonItem = { - var tempRefreshBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.refresh, + var tempRefreshBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.refresh, target: self, action: #selector(SwiftWebVC.reloadTapped(_:))) tempRefreshBarButtonItem.tintColor = self.buttonColor @@ -50,7 +50,7 @@ public class SwiftWebVC: UIViewController { }() lazy var stopBarButtonItem: UIBarButtonItem = { - var tempStopBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.stop, + var tempStopBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.stop, target: self, action: #selector(SwiftWebVC.stopTapped(_:))) tempStopBarButtonItem.tintColor = self.buttonColor @@ -58,7 +58,7 @@ public class SwiftWebVC: UIViewController { }() lazy var actionBarButtonItem: UIBarButtonItem = { - var tempActionBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.action, + var tempActionBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.action, target: self, action: #selector(SwiftWebVC.actionButtonTapped(_:))) tempActionBarButtonItem.tintColor = self.buttonColor @@ -173,8 +173,8 @@ public class SwiftWebVC: UIViewController { let refreshStopBarButtonItem: UIBarButtonItem = webView.isLoading ? stopBarButtonItem : refreshBarButtonItem - let fixedSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.fixedSpace, target: nil, action: nil) - let flexibleSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.flexibleSpace, target: nil, action: nil) + let fixedSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.fixedSpace, target: nil, action: nil) + let flexibleSpace: UIBarButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonItem.SystemItem.flexibleSpace, target: nil, action: nil) if (UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad) { diff --git a/SwiftWebVC/SwiftWebVCActivity.swift b/SwiftWebVC/SwiftWebVCActivity.swift index a73bd11..cb095da 100755 --- a/SwiftWebVC/SwiftWebVCActivity.swift +++ b/SwiftWebVC/SwiftWebVCActivity.swift @@ -14,10 +14,10 @@ class SwiftWebVCActivity: UIActivity { var URLToOpen: URL? var schemePrefix: String? - override var activityType : UIActivityType? { + override var activityType : UIActivity.ActivityType? { let typeArray = "\(type(of: self))".components(separatedBy: ".") let _type: String = typeArray[typeArray.count-1] - return UIActivityType(rawValue: _type) + return UIActivity.ActivityType(rawValue: _type) } override var activityImage : UIImage { diff --git a/SwiftWebVC/SwiftWebVCActivityChrome.swift b/SwiftWebVC/SwiftWebVCActivityChrome.swift index aee26ba..a614544 100755 --- a/SwiftWebVC/SwiftWebVCActivityChrome.swift +++ b/SwiftWebVC/SwiftWebVCActivityChrome.swift @@ -24,7 +24,7 @@ class SwiftWebVCActivityChrome : SwiftWebVCActivity { } override func perform() { - let inputURL: URL! = URLToOpen as URL! + let inputURL: URL! = URLToOpen as URL? let scheme: String! = inputURL.scheme // Replace the URL Scheme with the Chrome equivalent. @@ -38,7 +38,7 @@ class SwiftWebVCActivityChrome : SwiftWebVCActivity { // Proceed only if a valid Google Chrome URI Scheme is available. if chromeScheme != nil { - let absoluteString: NSString! = inputURL!.absoluteString as NSString! + let absoluteString: NSString! = inputURL!.absoluteString as NSString? let rangeForScheme: NSRange! = absoluteString.range(of: ":") let urlNoScheme: String! = absoluteString.substring(from: rangeForScheme.location) let chromeURLString: String! = chromeScheme!+urlNoScheme From 66913c7c01764eae4f3bf8cbdf2b74cde7815edf Mon Sep 17 00:00:00 2001 From: Bin Hua Date: Mon, 5 Jul 2021 16:18:58 +0800 Subject: [PATCH 2/3] remove .swift-version --- .swift-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 5186d07..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.0 From 7c18f29b7fa364afd6acd61d02ee469e81ffa397 Mon Sep 17 00:00:00 2001 From: Bin Hua Date: Mon, 5 Jul 2021 16:20:55 +0800 Subject: [PATCH 3/3] remove add swift version to SwiftWebVC.podspec --- SwiftWebVC.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/SwiftWebVC.podspec b/SwiftWebVC.podspec index ce6c4e2..428c0a9 100755 --- a/SwiftWebVC.podspec +++ b/SwiftWebVC.podspec @@ -10,6 +10,7 @@ Pod::Spec.new do |s| s.name = 'SwiftWebVC' s.version = '0.4.2' s.summary = 'SwiftWebVC is a simple inline browser for your Swift iOS app.' + s.swift_version = '4.0' # This description is used to generate tags and improve search results. # * Think: What does it do? Why did you write it? What is the focus?