From f25caf706dc48619a2bc9451f5c7210c2948a120 Mon Sep 17 00:00:00 2001 From: Erdi Kanik Date: Wed, 27 Mar 2019 14:07:02 +0300 Subject: [PATCH 1/3] Add swift 4.2 compatibility --- .swift-version | 2 +- IGColorPicker.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.swift-version b/.swift-version index 9f55b2c..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0 +4.2 diff --git a/IGColorPicker.podspec b/IGColorPicker.podspec index 6b19d3d..298047d 100644 --- a/IGColorPicker.podspec +++ b/IGColorPicker.podspec @@ -16,5 +16,5 @@ s.ios.deployment_target = '8.3' s.source_files = 'IGColorPicker/Classes/**/*' -s.dependency 'M13Checkbox', '~> 3.2.0' +s.dependency 'M13Checkbox', '~> 3.2.2' end From 42154942a64b8ba17db1b3f71ab1f2db3fe904ce Mon Sep 17 00:00:00 2001 From: Erdi Kanik Date: Wed, 27 Mar 2019 14:13:42 +0300 Subject: [PATCH 2/3] Update example project --- Example/IGColorPicker.xcodeproj/project.pbxproj | 4 ++-- Example/IGColorPicker/AppDelegate.swift | 2 +- Example/Podfile.lock | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Example/IGColorPicker.xcodeproj/project.pbxproj b/Example/IGColorPicker.xcodeproj/project.pbxproj index ab5d420..94da8e2 100644 --- a/Example/IGColorPicker.xcodeproj/project.pbxproj +++ b/Example/IGColorPicker.xcodeproj/project.pbxproj @@ -470,7 +470,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -486,7 +486,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Example/IGColorPicker/AppDelegate.swift b/Example/IGColorPicker/AppDelegate.swift index f491e72..56a7e11 100644 --- a/Example/IGColorPicker/AppDelegate.swift +++ b/Example/IGColorPicker/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/Example/Podfile.lock b/Example/Podfile.lock index 3baf6b8..377164e 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,6 +1,6 @@ PODS: - IGColorPicker (0.4.2): - - M13Checkbox (~> 3.2.0) + - M13Checkbox (~> 3.2.2) - M13Checkbox (3.2.2) DEPENDENCIES: @@ -15,7 +15,7 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - IGColorPicker: 518c7f1ccddd8b28bd6b1e552091240ef48039e5 + IGColorPicker: 337041039b8807c2b6381878b46d778980e83b34 M13Checkbox: a8c2491cfbbca10797925fd0b9154a782bf40d89 PODFILE CHECKSUM: 4ebb9ec0d26d8739b0c18dc9faaa5462d18e8245 From 0ad524e2647564372c709d2fa836ba9eb18c31d2 Mon Sep 17 00:00:00 2001 From: Erdi Kanik Date: Wed, 27 Mar 2019 15:23:11 +0300 Subject: [PATCH 3/3] Pod version upgraded --- Example/IGColorPicker.xcodeproj/project.pbxproj | 2 +- Example/Podfile.lock | 8 ++++---- IGColorPicker.podspec | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Example/IGColorPicker.xcodeproj/project.pbxproj b/Example/IGColorPicker.xcodeproj/project.pbxproj index 94da8e2..cb7b1a3 100644 --- a/Example/IGColorPicker.xcodeproj/project.pbxproj +++ b/Example/IGColorPicker.xcodeproj/project.pbxproj @@ -48,7 +48,7 @@ 9FAEF4144B69B4DE10AECF21 /* Pods-IGColorPicker_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IGColorPicker_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-IGColorPicker_Example/Pods-IGColorPicker_Example.release.xcconfig"; sourceTree = ""; }; B249C39F1D8ABCE8C406EED6 /* Pods-IGColorPicker_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IGColorPicker_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IGColorPicker_Tests/Pods-IGColorPicker_Tests.debug.xcconfig"; sourceTree = ""; }; B5CB5F41429ED1420D267465 /* Pods-IGColorPicker_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IGColorPicker_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-IGColorPicker_Tests/Pods-IGColorPicker_Tests.release.xcconfig"; sourceTree = ""; }; - E6F4F3AABBDCF3FE8E4F59CF /* IGColorPicker.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = IGColorPicker.podspec; path = ../IGColorPicker.podspec; sourceTree = ""; }; + E6F4F3AABBDCF3FE8E4F59CF /* IGColorPicker.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = IGColorPicker.podspec; path = ../IGColorPicker.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 377164e..8325c15 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,7 +1,7 @@ PODS: - IGColorPicker (0.4.2): - - M13Checkbox (~> 3.2.2) - - M13Checkbox (3.2.2) + - M13Checkbox (~> 3.3.2) + - M13Checkbox (3.3.2) DEPENDENCIES: - IGColorPicker (from `../`) @@ -15,8 +15,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - IGColorPicker: 337041039b8807c2b6381878b46d778980e83b34 - M13Checkbox: a8c2491cfbbca10797925fd0b9154a782bf40d89 + IGColorPicker: 5d578b4d3bb2d51c541ecf14dd9737b53c0c55f2 + M13Checkbox: d75dca81d61c9903e7f091f32b35a3254bc97dce PODFILE CHECKSUM: 4ebb9ec0d26d8739b0c18dc9faaa5462d18e8245 diff --git a/IGColorPicker.podspec b/IGColorPicker.podspec index 298047d..8c23e8d 100644 --- a/IGColorPicker.podspec +++ b/IGColorPicker.podspec @@ -16,5 +16,5 @@ s.ios.deployment_target = '8.3' s.source_files = 'IGColorPicker/Classes/**/*' -s.dependency 'M13Checkbox', '~> 3.2.2' +s.dependency 'M13Checkbox', '~> 3.3.2' end