diff --git a/RichEditorView.podspec b/RichEditorView.podspec index 7ae3a6ed..269fe8c3 100644 --- a/RichEditorView.podspec +++ b/RichEditorView.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.social_media_url = 'https://twitter.com/cjwirth' s.platform = :ios, '8.0' - s.swift_version = '4.0' + s.swift_version = '4.2' s.requires_arc = true s.source_files = 'RichEditorView/Classes/*' diff --git a/RichEditorView.xcodeproj/project.pbxproj b/RichEditorView.xcodeproj/project.pbxproj index c421cf52..fed71120 100644 --- a/RichEditorView.xcodeproj/project.pbxproj +++ b/RichEditorView.xcodeproj/project.pbxproj @@ -386,12 +386,12 @@ TargetAttributes = { FBA6AAF81AD3EC9F00721644 = { CreatedOnToolsVersion = 6.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; FBA6AB031AD3EC9F00721644 = { CreatedOnToolsVersion = 6.2; DevelopmentTeam = XATA46WWFJ; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; }; }; @@ -624,7 +624,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -642,7 +642,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.cjwirth.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -658,7 +658,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 = 4.2; }; name = Debug; }; @@ -670,7 +670,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 = 4.2; }; name = Release; }; diff --git a/RichEditorView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/RichEditorView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/RichEditorView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + 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://"