diff --git a/GradientSlider.xcodeproj/project.pbxproj b/GradientSlider.xcodeproj/project.pbxproj index 3b18e2e..c6548a4 100644 --- a/GradientSlider.xcodeproj/project.pbxproj +++ b/GradientSlider.xcodeproj/project.pbxproj @@ -93,12 +93,13 @@ FC1C41711B730A410083C062 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "Jonathan Hull"; TargetAttributes = { FC1C41781B730A410083C062 = { CreatedOnToolsVersion = 7.0; DevelopmentTeam = 87YJPWK77H; + LastSwiftMigration = 1010; }; }; }; @@ -178,12 +179,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -230,12 +233,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -273,7 +278,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.jonhull.GradientSlider; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -286,7 +291,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.jonhull.GradientSlider; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/GradientSlider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/GradientSlider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/GradientSlider.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/GradientSlider/GradientSlider.swift b/GradientSlider/GradientSlider.swift index 8d3b80b..9574fbd 100644 --- a/GradientSlider/GradientSlider.swift +++ b/GradientSlider/GradientSlider.swift @@ -228,12 +228,12 @@ import UIKit //MARK: - Layout override var intrinsicContentSize:CGSize { - return CGSize(width: UIViewNoIntrinsicMetric, height: thumbSize) + return CGSize(width: UIView.noIntrinsicMetric, height: thumbSize) } // func alignmentRectInsets() -> UIEdgeInsets { override var alignmentRectInsets: UIEdgeInsets { - return UIEdgeInsetsMake(4.0, 2.0, 4.0, 2.0) + return UIEdgeInsets.init(top: 4.0, left: 2.0, bottom: 4.0, right: 2.0) } override func layoutSublayers(of layer: CALayer) { @@ -329,7 +329,7 @@ import UIKit let diameter = max(thumbSize,44.0) let r = CGRect(x: center.x - diameter/2.0, y: center.y - diameter/2.0, width: diameter, height: diameter) if r.contains(pt){ - sendActions(for: UIControlEvents.touchDown) + sendActions(for: UIControl.Event.touchDown) return true } return false @@ -341,7 +341,7 @@ import UIKit let newValue = valueForLocation(point: pt) setValue(newValue, animated: false) if(continuous){ - sendActions(for: UIControlEvents.valueChanged) + sendActions(for: UIControl.Event.valueChanged) actionBlock(self,newValue,false) } return true @@ -354,7 +354,7 @@ import UIKit setValue(newValue, animated: false) } actionBlock(self,_value,true) - sendActions(for: [UIControlEvents.valueChanged, UIControlEvents.touchUpInside]) + sendActions(for: [UIControl.Event.valueChanged, UIControl.Event.touchUpInside]) }