From 40be0e7f2e235ee58bc789f2f0d34ce0b8d488b0 Mon Sep 17 00:00:00 2001 From: James Rickett Date: Mon, 8 Oct 2018 11:27:14 +1100 Subject: [PATCH] update project for swift 4.2 --- Example/AppDelegate.swift | 2 +- Podfile | 6 +++--- Podfile.lock | 12 ++++++------ RichTextRow.podspec | 2 +- RichTextRow.xcodeproj/project.pbxproj | 12 ++++++------ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ Sources/RichTextRow.swift | 2 +- 7 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 RichTextRow.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift index 9f83c14..a58b916 100644 --- a/Example/AppDelegate.swift +++ b/Example/AppDelegate.swift @@ -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 } diff --git a/Podfile b/Podfile index 7cc2431..bad737a 100644 --- a/Podfile +++ b/Podfile @@ -3,15 +3,15 @@ platform :ios, '8.0' target 'RichTextRow' do use_frameworks! - pod 'Eureka', '~> 4.1.1' + pod 'Eureka', '~> 4.3.0' target 'Example' do inherit! :search_paths - pod 'Eureka', '~> 4.1.1' + pod 'Eureka', '~> 4.3.0' end target 'RichTextRowTests' do inherit! :search_paths - pod 'Eureka', '~> 4.1.1' + pod 'Eureka', '~> 4.3.0' end end diff --git a/Podfile.lock b/Podfile.lock index de63334..0de1d67 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,16 +1,16 @@ PODS: - - Eureka (4.1.1) + - Eureka (4.3.0) DEPENDENCIES: - - Eureka (~> 4.1.1) + - Eureka (~> 4.3.0) SPEC REPOS: - https://github.com/CocoaPods/Specs.git: + https://github.com/cocoapods/specs.git: - Eureka SPEC CHECKSUMS: - Eureka: b88fb930e42c79f8c03c373d0fcdc28c1d6c50ed + Eureka: 6d711cb30ca333b4bc893110285a722ae3840114 -PODFILE CHECKSUM: d696db62feb1ead60de607ffc8784146bb869355 +PODFILE CHECKSUM: cbfb51654660c59b55d25d85c2ad9a318289e63e -COCOAPODS: 1.5.0 +COCOAPODS: 1.5.3 diff --git a/RichTextRow.podspec b/RichTextRow.podspec index 1c24055..81991e0 100644 --- a/RichTextRow.podspec +++ b/RichTextRow.podspec @@ -11,5 +11,5 @@ Pod::Spec.new do |s| s.requires_arc = true s.ios.source_files = 'Sources/**/*.{swift}' s.ios.resource_bundle = { 'Resources' => 'Sources/**/*.{html,js}' } - s.dependency 'Eureka', '4.1.1' + s.dependency 'Eureka', '4.3.0' end \ No newline at end of file diff --git a/RichTextRow.xcodeproj/project.pbxproj b/RichTextRow.xcodeproj/project.pbxproj index 3d9b749..c8e52aa 100644 --- a/RichTextRow.xcodeproj/project.pbxproj +++ b/RichTextRow.xcodeproj/project.pbxproj @@ -597,7 +597,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -625,7 +625,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.hubspot.RichTextRow; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -640,7 +640,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.hubspot.Example; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -653,7 +653,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.hubspot.Example; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -665,7 +665,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.hubspot.RichTextRowTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -677,7 +677,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.hubspot.RichTextRowTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/RichTextRow.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/RichTextRow.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/RichTextRow.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Sources/RichTextRow.swift b/Sources/RichTextRow.swift index 2511d45..ef18021 100644 --- a/Sources/RichTextRow.swift +++ b/Sources/RichTextRow.swift @@ -10,7 +10,7 @@ import Eureka public final class RichTextCell: Cell, CellType, RichTextEditorDelegate { - required public init(style: UITableViewCellStyle, reuseIdentifier: String?) { + required public init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { super.init(style: style, reuseIdentifier: reuseIdentifier) }