Update to swift 4.2 / new build system

inderdhir · Jan 11, 2019 · 07cbe5b · 07cbe5b
1 parent 436965c
commit 07cbe5b
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 104 deletions.
diff --git a/Example/HoldToClickButton.xcodeproj/project.pbxproj b/Example/HoldToClickButton.xcodeproj/project.pbxproj
@@ -428,7 +428,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -474,7 +474,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -491,7 +491,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -507,7 +507,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -532,7 +532,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HoldToClickButton_Example.app/HoldToClickButton_Example";
 			};
 			name = Debug;
@@ -554,7 +554,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HoldToClickButton_Example.app/HoldToClickButton_Example";
 			};
 			name = Release;

diff --git a/Example/HoldToClickButton.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Example/HoldToClickButton.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>BuildSystemType</key>
-	<string>Original</string>
-</dict>
+<dict/>
 </plist>
diff --git a/Example/HoldToClickButton/AppDelegate.swift b/Example/HoldToClickButton/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
@@ -1,5 +1,5 @@
 PODS:
-  - HoldToClickButton (1.0)
+  - HoldToClickButton (1.1.0)
 
 DEPENDENCIES:
   - HoldToClickButton (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  HoldToClickButton: 41e02f6ad37eae71792d8a4e53d834bdd856da09
+  HoldToClickButton: a80f5ae2910fbe6af195e765b97f0b1e38b2edbc
 
 PODFILE CHECKSUM: b09221770085393dc7f5a969d761ef3000566ccc
 

diff --git a/Example/Pods/Local Podspecs/HoldToClickButton.podspec.json b/Example/Pods/Local Podspecs/HoldToClickButton.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/HoldToClickButton/Info.plist b/Example/Pods/Target Support Files/HoldToClickButton/Info.plist
diff --git a/HoldToClickButton.podspec b/HoldToClickButton.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'HoldToClickButton'
-  s.version          = '1.0.1'
+  s.version          = '1.1.0'
   s.summary          = 'Custom UIButton for iOS that the user needs to hold to click with an optional cancel animation'
 
 # This description is used to generate tags and improve search results.
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'Inder Dhir' => '[email protected]' }
   s.source           = { :git => 'https://github.com/inderdhir/HoldToClickButton.git', :tag => s.version.to_s }
-  s.swift_version    = '3.2'
+  s.swift_version    = '4.2'
   s.ios.deployment_target = '10.0'
 
   s.source_files = 'HoldToClickButton/Classes/**/*'

diff --git a/HoldToClickButton/Classes/HoldToClickButton.swift b/HoldToClickButton/Classes/HoldToClickButton.swift
@@ -34,7 +34,7 @@ public class HoldToClickButton: UIButton {
     public var animationDuration: TimeInterval = 1.5
 
     /// Options for progress animation. Default: curveEaseInOut
-    public var animationOptions: UIViewAnimationOptions = .curveEaseInOut
+    public var animationOptions: UIView.AnimationOptions = .curveEaseInOut
 
     /// Toggle cancel 'shake' animation. Default: true
     public var isCancelAnimationEnabled = true
@@ -93,7 +93,7 @@ public class HoldToClickButton: UIButton {
         progressView.backgroundColor = fillColor
 
         addSubview(progressView)
-        sendSubview(toBack: progressView)
+        sendSubviewToBack(progressView)
 
         progressView.translatesAutoresizingMaskIntoConstraints = false
         progressView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true