From 6717758ae113f0b9db6356d989d7e95caa1fc0f0 Mon Sep 17 00:00:00 2001 From: Gray Campbell <12163070+graycampbell@users.noreply.github.com> Date: Wed, 21 Nov 2018 16:07:58 -0600 Subject: [PATCH 1/3] Update to Swift 4.2 --- GCCountryPicker.xcodeproj/project.pbxproj | 11 ++++++----- GCCountryPickerDemo.xcodeproj/project.pbxproj | 5 +++-- Sources/GCCountryPickerDemo/AppDelegate.swift | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/GCCountryPicker.xcodeproj/project.pbxproj b/GCCountryPicker.xcodeproj/project.pbxproj index 3b08ab9..1853868 100644 --- a/GCCountryPicker.xcodeproj/project.pbxproj +++ b/GCCountryPicker.xcodeproj/project.pbxproj @@ -177,11 +177,12 @@ TargetAttributes = { E213603A1FAD6FD7005B0ACF = { CreatedOnToolsVersion = 9.1; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; }; E2644B3A1F7D92DD0034EA06 = { CreatedOnToolsVersion = 9.0; - LastSwiftMigration = 0900; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; }; }; @@ -266,7 +267,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.graycampbell.GCCountryPickerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -280,7 +281,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.graycampbell.GCCountryPickerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -419,7 +420,7 @@ PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -440,7 +441,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.graycampbell.GCCountryPicker; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/GCCountryPickerDemo.xcodeproj/project.pbxproj b/GCCountryPickerDemo.xcodeproj/project.pbxproj index db12dc4..ea01243 100644 --- a/GCCountryPickerDemo.xcodeproj/project.pbxproj +++ b/GCCountryPickerDemo.xcodeproj/project.pbxproj @@ -116,6 +116,7 @@ TargetAttributes = { E2644B4E1F7D93260034EA06 = { CreatedOnToolsVersion = 9.0; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; }; }; @@ -322,7 +323,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.graycampbell.GCCountryPickerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -336,7 +337,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.graycampbell.GCCountryPickerDemo; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Sources/GCCountryPickerDemo/AppDelegate.swift b/Sources/GCCountryPickerDemo/AppDelegate.swift index 02710ad..726a698 100644 --- a/Sources/GCCountryPickerDemo/AppDelegate.swift +++ b/Sources/GCCountryPickerDemo/AppDelegate.swift @@ -13,7 +13,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 { return true } From 7f835a28880a8c4ec344190a65b4254ec301e775 Mon Sep 17 00:00:00 2001 From: Gray Campbell <12163070+graycampbell@users.noreply.github.com> Date: Wed, 21 Nov 2018 16:09:18 -0600 Subject: [PATCH 2/3] Update .swift-version --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index 7d5c902..bf77d54 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.1 +4.2 From 38b17b65e4a25b1571740f306e78e1bbd192b380 Mon Sep 17 00:00:00 2001 From: Gray Campbell <12163070+graycampbell@users.noreply.github.com> Date: Wed, 21 Nov 2018 16:12:45 -0600 Subject: [PATCH 3/3] Bump version number --- GCCountryPicker.podspec | 2 +- Sources/GCCountryPicker/Info.plist | 2 +- Sources/GCCountryPickerDemo/Info.plist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GCCountryPicker.podspec b/GCCountryPicker.podspec index 88b029f..d11f0ce 100644 --- a/GCCountryPicker.podspec +++ b/GCCountryPicker.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'GCCountryPicker' - s.version = '2.4.1' + s.version = '2.4.2' s.license = { :type => 'MIT', :file => 'LICENSE' } s.summary = 'A localized, searchable country picker view controller with optional calling codes for iOS 9+ written in Swift.' s.description = <<-DESC diff --git a/Sources/GCCountryPicker/Info.plist b/Sources/GCCountryPicker/Info.plist index d4d78c3..6b789cc 100644 --- a/Sources/GCCountryPicker/Info.plist +++ b/Sources/GCCountryPicker/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.4.1 + 2.4.2 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/Sources/GCCountryPickerDemo/Info.plist b/Sources/GCCountryPickerDemo/Info.plist index 00e39ad..a28f5e1 100644 --- a/Sources/GCCountryPickerDemo/Info.plist +++ b/Sources/GCCountryPickerDemo/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.4.1 + 2.4.2 CFBundleVersion 1.0 LSRequiresIPhoneOS