Merge pull request #13 from steamclock/swift4.2

Migrate to Swift 4.2
steamclock · Jan 10, 2019 · 20e5d73 · 20e5d73
2 parents 566ba93 + fe8057b
commit 20e5d73
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.2.0] - 2019-01-08
+### Changed
+- Use Swift 4.2
+
 ## [1.1.0] - 2018-08-02
 ### Added
 - Added this changelog.
 
 ### Changed
 - Changed the currently selected endpoint image to be less intrusive.
-- Updated sample images.
+- Updated sample images.
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Switchcraft.xcodeproj/project.pbxproj b/Example/Switchcraft.xcodeproj/project.pbxproj
@@ -490,7 +490,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;
 		};
@@ -506,7 +506,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/Switchcraft/AppDelegate.swift b/Example/Switchcraft/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]? = nil) -> Bool {
         return true
     }
 }

diff --git a/README.md b/README.md
@@ -56,14 +56,14 @@ To get updates whenever an endpoint is selected, you've got two options:
     ```
     class MyVC: UIViewController {
         // ...
-        
+
         override func viewDidLoad() {
             super.viewDidLoad()
-            
+
             Switchcraft.delegate = self
         }
     }
-    
+
     extension MyVC: SwitchcraftDelegate {
         func switchcraft(_ switchcraft: Switchcraft, didSelectEndpoint endpoint: Endpoint) {
             // Handle your endpoint selection here
@@ -73,13 +73,13 @@ To get updates whenever an endpoint is selected, you've got two options:
 
 2. `NotificationCenter`
 
-    Endpoint selections are also broadcast to the `NotificationCenter`. 
-    
+    Endpoint selections are also broadcast to the `NotificationCenter`.
+
     ```
     NotificationCenter.default.addObserver(self, selector: #selector(endpointSelected(_:)), name: .SwitchcraftDidSelectEndpoint, object: nil)
-    
+
     ...
-    
+
     @objc private func endpointSelected(_ sender: NSNotification) {
         guard let endpoint = sender.userInfo?[Notification.Key.Endpoint] as? Endpoint else {
             return
@@ -108,7 +108,7 @@ extension Switchcraft {
 ```swift
 extension MyVC: SwitchcraftDelegate {
     ...
- 
+
     func switchcraft(_ switchcraft: Switchcraft, didTapAction action: Action)
         // Handle custom action selection here
     }
@@ -153,7 +153,7 @@ extension MyVC: SwitchcraftDelegate {
 }
 
 ```
-    
+
 ### Getting Fancy
 
 There are lots of knobs to tweak in your config. See [Config.swift](https://github.com/steamclock/switchcraft/blob/master/Switchcraft/Classes/Config.swift) for a full list.
@@ -165,8 +165,8 @@ To run the example project, clone the repo, and run `pod install` from the Examp
 ## Requirements
 
 - iOS 9.3 or above
-- Xcode 8.2.1 or above
-- Swift 3.2 or above
+- Xcode 10 or above
+- Swift 4.2 or above
 
 ## Installation
 

diff --git a/Switchcraft.podspec b/Switchcraft.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Switchcraft'
-  s.version          = '1.1.0'
+  s.version          = '1.2.0'
   s.summary          = 'Drop and go endpoint selector written in Swift.'
   s.homepage         = 'https://github.com/steamclock/Switchcraft'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -11,5 +11,5 @@ Pod::Spec.new do |s|
   'Switchcraft' => ['Switchcraft/*/Assets.xcassets']
   }
   s.source_files = 'Switchcraft/Classes/**/*'
-  s.swift_version = '3.2'
+  s.swift_version = '4.2'
 end