Skip to content

Swift 5 Migration #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LokeshbabuP wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Swift 5 Migration #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Example/SwiftWebVCExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
da,
Expand Down Expand Up @@ -371,7 +372,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.swiftweb.SwiftWebVCExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -384,7 +385,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.swiftweb.SwiftWebVCExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Example/SwiftWebVCExample/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
2 changes: 1 addition & 1 deletion SwiftWebVC/SwiftModalWebVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
14 changes: 7 additions & 7 deletions SwiftWebVC/SwiftWebVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -42,23 +42,23 @@ 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
return tempRefreshBarButtonItem
}()

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
return tempStopBarButtonItem
}()

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
Expand Down Expand Up @@ -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) {

Expand Down
4 changes: 2 additions & 2 deletions SwiftWebVC/SwiftWebVCActivity.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions SwiftWebVC/SwiftWebVCActivityChrome.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down