UPT: migrated to Swift 4.2

KennethTsang · Oct 3, 2018 · 2d1a330 · 2d1a330
1 parent 87c608e
commit 2d1a330
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 deletions.
diff --git a/Example/NumberField.xcodeproj/project.pbxproj b/Example/NumberField.xcodeproj/project.pbxproj
@@ -519,7 +519,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -535,7 +535,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/Example/NumberField/AppDelegate.swift b/Example/NumberField/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/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/NumberField.podspec b/NumberField.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'NumberField'
-  s.version          = '0.4.0'
+  s.version          = '0.4.2'
   s.summary          = 'Numeric field with Numpad keyboard on both iPhone and iPad'
 
 # This description is used to generate tags and improve search results.

diff --git a/NumberField/Classes/FakeCursor.swift b/NumberField/Classes/FakeCursor.swift
@@ -13,7 +13,7 @@ final class FakeCursor: UIView {
 
 
     override var intrinsicContentSize: CGSize {
-        return CGSize(width: 2, height: UIViewNoIntrinsicMetric)
+        return CGSize(width: 2, height: UIView.noIntrinsicMetric)
     }
 
     override var isHidden: Bool {

diff --git a/NumberField/Classes/NumberField.swift b/NumberField/Classes/NumberField.swift
@@ -171,7 +171,7 @@ import UIKit
     }
 
     override open var intrinsicContentSize: CGSize {
-        return CGSize(width: UIViewNoIntrinsicMetric, height: 30)
+        return CGSize(width: UIView.noIntrinsicMetric, height: 30)
     }
 
     //MARK: Cursor and Highlight

diff --git a/NumberField/Classes/UIControlEventsExtension.swift b/NumberField/Classes/UIControlEventsExtension.swift
@@ -8,6 +8,6 @@
 
 import UIKit
 
-extension UIControlEvents {
-    public static var editingRejected: UIControlEvents { return UIControlEvents(rawValue: 0b0001 << 24) }
+extension UIControl.Event {
+    public static var editingRejected: UIControl.Event { return UIControl.Event(rawValue: 0b0001 << 24) }
 }
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Version](https://img.shields.io/cocoapods/v/NumberField.svg?style=flat)](http://cocoapods.org/pods/NumberField)
 [![License](https://img.shields.io/cocoapods/l/NumberField.svg?style=flat)](http://cocoapods.org/pods/NumberField)
 [![Platform](https://img.shields.io/cocoapods/p/NumberField.svg?style=flat)](http://cocoapods.org/pods/NumberField)
-[![Language](https://img.shields.io/badge/Swift-4.0-orange.svg?style=flat)](http://cocoapods.org/pods/NumberField)
+[![Language](https://img.shields.io/badge/Swift-4.2-orange.svg?style=flat)](http://cocoapods.org/pods/NumberField)
 
 <img src="DEMO.gif" border=1 style="border-color:#eeeeee">
 
@@ -18,8 +18,16 @@ iOS 9.0 or above
 NumberField is available through [CocoaPods](http://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
+Swift 4.2<br>
+
+```ruby
+pod 'NumberField', '0.4.2'
+```
+
+Swift 4.0<br>
+
 ```ruby
-pod 'NumberField', '~> 0.4'
+pod 'NumberField', '0.4.0'
 ```
 
 ## Usage