Skip to content

Commit 3be747b

Browse files
Coledunsbykyleweiner
authored andcommitted
Update to Swift 5.1 / Xcode 11 (#17)
Commits: * Omit return for single-expression functions * fileprivate → private * Specify access level on extension instead of on each method * Remove .swift-version file * Update podspec
1 parent 46bd5db commit 3be747b

File tree

6 files changed

+40
-40
lines changed

6 files changed

+40
-40
lines changed

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Example/Example/Controllers/ViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extension ViewController {
4343
}
4444

4545
// Presents a `UIAlertController` when the stepper's value is clamped.
46-
fileprivate func presentValueClampedAlert() {
46+
private func presentValueClampedAlert() {
4747
let alertController = UIAlertController(
4848
title: "Stepper Limit Reached",
4949
message: "The step value was clamped. It must be between \(stepper.minimumValue) and \(stepper.maximumValue).",
@@ -57,7 +57,7 @@ extension ViewController {
5757
// MARK: - UISwitch Configuration & Event Handling
5858

5959
extension ViewController {
60-
fileprivate func configureSwitches() {
60+
private func configureSwitches() {
6161
wrapsSwitch.isOn = stepper.wraps
6262
autoRepeatSwitch.isOn = stepper.autoRepeat
6363
}

Example/Example/Views/CountLabel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class CountLabel: UILabel {
1515

1616
extension UIFontDescriptor {
1717
func stepperDescriptor() -> UIFontDescriptor {
18-
return addingAttributes([
18+
addingAttributes([
1919
UIFontDescriptor.AttributeName.featureSettings: [
2020
[
2121
UIFontDescriptor.FeatureKey.featureIdentifier: kNumberSpacingType,

KWStepper.podspec

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
Pod::Spec.new do |s|
2-
s.name = "KWStepper"
3-
s.version = "2.5.1"
4-
s.summary = "A stepper control with flexible UI and tailored UX."
5-
s.homepage = "https://github.com/kyleweiner/KWStepper"
6-
s.license = { :type => "MIT", :file => "LICENSE" }
7-
s.author = { "Kyle Weiner" => "kyle@kylemade.com" }
8-
s.screenshots = "https://raw.githubusercontent.com/kyleweiner/KWStepper/master/screenshots.png"
9-
s.source = { :git => "https://github.com/kyleweiner/KWStepper.git", :tag => s.version }
10-
s.source_files = "Source/*.swift"
11-
s.platform = :ios, '8.0'
12-
s.requires_arc = true
13-
s.description = "KWStepper is a stepper control written in Swift. Unlike UIStepper, KWStepper allows for a fully customized UI and provides callbacks for tailoring the UX."
2+
s.name = "KWStepper"
3+
s.version = "2.5.2"
4+
s.summary = "A stepper control with flexible UI and tailored UX."
5+
s.homepage = "https://github.com/kyleweiner/KWStepper"
6+
s.license = { :type => "MIT", :file => "LICENSE" }
7+
s.author = { "Kyle Weiner" => "kyle@kylemade.com" }
8+
s.screenshots = "https://raw.githubusercontent.com/kyleweiner/KWStepper/master/screenshots.png"
9+
s.source = { :git => "https://github.com/kyleweiner/KWStepper.git", :tag => s.version }
10+
s.source_files = "Source/*.swift"
11+
s.platform = :ios, '8.0'
12+
s.requires_arc = true
13+
s.description = "KWStepper is a stepper control written in Swift. Unlike UIStepper, KWStepper allows for a fully customized UI and provides callbacks for tailoring the UX."
14+
s.swift_version = "5.1"
1415
end

Source/KWStepper+Chaining.swift

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,84 +4,84 @@
44
// https://github.com/kyleweiner/KWStepper
55
//
66

7-
extension KWStepper {
7+
public extension KWStepper {
88
// MARK: - Configuration Methods
99

1010
/// Sets the stepper's `autoRepeat` value.
1111
@discardableResult
12-
public func autoRepeat(_ value: Bool) -> Self {
12+
func autoRepeat(_ value: Bool) -> Self {
1313
autoRepeat = value
1414

1515
return self
1616
}
1717

1818
/// Sets the stepper's `autoRepeatInterval`.
1919
@discardableResult
20-
public func autoRepeatInterval(_ value: TimeInterval) -> Self {
20+
func autoRepeatInterval(_ value: TimeInterval) -> Self {
2121
autoRepeatInterval = value
2222

2323
return self
2424
}
2525

2626
/// Sets the stepper's `wraps` value.
2727
@discardableResult
28-
public func wraps(_ value: Bool) -> Self {
28+
func wraps(_ value: Bool) -> Self {
2929
wraps = value
3030

3131
return self
3232
}
3333

3434
/// Sets the stepper's `minimumValue`.
3535
@discardableResult
36-
public func minimumValue(_ value: Double) -> Self {
36+
func minimumValue(_ value: Double) -> Self {
3737
minimumValue = value
3838

3939
return self
4040
}
4141

4242
/// Sets the stepper's `maximumValue`.
4343
@discardableResult
44-
public func maximumValue(_ value: Double) -> Self {
44+
func maximumValue(_ value: Double) -> Self {
4545
maximumValue = value
4646

4747
return self
4848
}
4949

5050
/// Sets the stepper's `decrementStepValue`.
5151
@discardableResult
52-
public func decrementStepValue(_ value: Double) -> Self {
52+
func decrementStepValue(_ value: Double) -> Self {
5353
decrementStepValue = value
5454

5555
return self
5656
}
5757

5858
/// Sets the stepper's `incrementStepValue`.
5959
@discardableResult
60-
public func incrementStepValue(_ value: Double) -> Self {
60+
func incrementStepValue(_ value: Double) -> Self {
6161
incrementStepValue = value
6262

6363
return self
6464
}
6565

6666
/// Sets the stepper's `roundingBehavior`.
6767
@discardableResult
68-
public func roundingBehavior(_ value: Double) -> Self {
68+
func roundingBehavior(_ value: Double) -> Self {
6969
self.roundingBehavior = roundingBehavior
7070

7171
return self
7272
}
7373

7474
/// Sets the stepper's `delegate`.
7575
@discardableResult
76-
public func delegate(_ value: KWStepperDelegate?) -> Self {
76+
func delegate(_ value: KWStepperDelegate?) -> Self {
7777
delegate = value
7878

7979
return self
8080
}
8181

8282
/// Sets the stepper's `value`.
8383
@discardableResult
84-
public func value(_ value: Double) -> Self {
84+
func value(_ value: Double) -> Self {
8585
self.value = value
8686

8787
return self
@@ -91,47 +91,47 @@ extension KWStepper {
9191

9292
/// Sets the stepper's `valueChangedCallback`.
9393
@discardableResult
94-
public func valueChanged(_ callback: KWStepperCallback?) -> Self {
94+
func valueChanged(_ callback: KWStepperCallback?) -> Self {
9595
valueChangedCallback = callback
9696

9797
return self
9898
}
9999

100100
/// Sets the stepper's `decrementCallback`.
101101
@discardableResult
102-
public func didDecrement(_ callback: KWStepperCallback?) -> Self {
102+
func didDecrement(_ callback: KWStepperCallback?) -> Self {
103103
decrementCallback = callback
104104

105105
return self
106106
}
107107

108108
/// Sets the stepper's `incrementCallback`.
109109
@discardableResult
110-
public func didIncrement(_ callback: KWStepperCallback?) -> Self {
110+
func didIncrement(_ callback: KWStepperCallback?) -> Self {
111111
incrementCallback = callback
112112

113113
return self
114114
}
115115

116116
/// Sets the stepper's `maxValueClampedCallback`.
117117
@discardableResult
118-
public func maxValueClamped(_ callback: KWStepperCallback?) -> Self {
118+
func maxValueClamped(_ callback: KWStepperCallback?) -> Self {
119119
maxValueClampedCallback = callback
120120

121121
return self
122122
}
123123

124124
/// Sets the stepper's `minValueClampedCallback`.
125125
@discardableResult
126-
public func minValueClamped(_ callback: KWStepperCallback?) -> Self {
126+
func minValueClamped(_ callback: KWStepperCallback?) -> Self {
127127
minValueClampedCallback = callback
128128

129129
return self
130130
}
131131

132132
/// Sets the stepper's `longPressEndedCallback`.
133133
@discardableResult
134-
public func longPressEnded(_ callback: KWStepperCallback?) -> Self {
134+
func longPressEnded(_ callback: KWStepperCallback?) -> Self {
135135
longPressEndedCallback = callback
136136

137137
return self
@@ -141,7 +141,7 @@ extension KWStepper {
141141

142142
/// Sets the stepper's `decrementStepValue` and `incrementStepValue`.
143143
@discardableResult
144-
public func stepValue(_ value: Double) -> Self {
144+
func stepValue(_ value: Double) -> Self {
145145
decrementStepValue = value
146146
incrementStepValue = value
147147

@@ -150,7 +150,7 @@ extension KWStepper {
150150

151151
/// Sets the stepper's `maxValueClampedCallback` and `minValueClampedCallback`.
152152
@discardableResult
153-
public func valueClamped(_ callback: @escaping KWStepperCallback) -> Self {
153+
func valueClamped(_ callback: @escaping KWStepperCallback) -> Self {
154154
maxValueClampedCallback = callback
155155
minValueClampedCallback = callback
156156

Source/KWStepper.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ open class KWStepper: UIControl {
138138

139139
// MARK: - Private Variables
140140

141-
fileprivate var longPressTimer: Timer?
141+
private var longPressTimer: Timer?
142142

143143
// MARK: - Initialization
144144

@@ -228,7 +228,7 @@ open class KWStepper: UIControl {
228228

229229
extension KWStepper {
230230
/// Called while `decrementButton` or `incrementButton` are long pressed.
231-
@objc fileprivate func didLongPress(_ sender: UIGestureRecognizer) {
231+
@objc private func didLongPress(_ sender: UIGestureRecognizer) {
232232
guard autoRepeat else {
233233
return
234234
}
@@ -240,7 +240,7 @@ extension KWStepper {
240240
}
241241
}
242242

243-
fileprivate func startLongPress(_ sender: UIGestureRecognizer) {
243+
private func startLongPress(_ sender: UIGestureRecognizer) {
244244
guard longPressTimer == nil else { return }
245245

246246
longPressTimer = Timer.scheduledTimer(
@@ -252,7 +252,7 @@ extension KWStepper {
252252
)
253253
}
254254

255-
fileprivate func endLongPress() {
255+
private func endLongPress() {
256256
guard let timer = longPressTimer else { return }
257257

258258
timer.invalidate()
@@ -267,6 +267,6 @@ extension KWStepper {
267267

268268
extension Double {
269269
func round(with behavior: NSDecimalNumberHandler) -> Double {
270-
return NSDecimalNumber(value: self).rounding(accordingToBehavior: behavior).doubleValue
270+
NSDecimalNumber(value: self).rounding(accordingToBehavior: behavior).doubleValue
271271
}
272272
}

0 commit comments

Comments
 (0)