From ca7b8e89164cc68570e2e5b74c5acf40046908d0 Mon Sep 17 00:00:00 2001 From: Sergey Aleksandrov Date: Mon, 3 Jun 2019 14:37:50 +0300 Subject: [PATCH] Migrated to Swift 5 --- RichEditorView.xcodeproj/project.pbxproj | 9 +++++---- RichEditorView/Classes/RichEditorView.swift | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/RichEditorView.xcodeproj/project.pbxproj b/RichEditorView.xcodeproj/project.pbxproj index c421cf52..a41d667c 100644 --- a/RichEditorView.xcodeproj/project.pbxproj +++ b/RichEditorView.xcodeproj/project.pbxproj @@ -400,6 +400,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = FBA6AAEF1AD3EC9F00721644; @@ -624,7 +625,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -642,7 +643,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.cjwirth.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -658,7 +659,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.cjwirth.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -670,7 +671,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.cjwirth.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/RichEditorView/Classes/RichEditorView.swift b/RichEditorView/Classes/RichEditorView.swift index 527b81c7..4e3bdc10 100644 --- a/RichEditorView/Classes/RichEditorView.swift +++ b/RichEditorView/Classes/RichEditorView.swift @@ -368,7 +368,7 @@ import UIKit // MARK: UIWebViewDelegate - public func webView(_ webView: UIWebView, shouldStartLoadWith request: URLRequest, navigationType: UIWebViewNavigationType) -> Bool { + public func webView(_ webView: UIWebView, shouldStartLoadWith request: URLRequest, navigationType: UIWebView.NavigationType) -> Bool { // Handle pre-defined editor actions let callbackPrefix = "re-callback://"