Merge pull request #18 from ivkosh/master

Updated to Swift 4
sasojadrovski · Jun 4, 2018 · 69e0cb3 · 69e0cb3
2 parents 9c6ce64 + abda5f6
commit 69e0cb3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/SJFluidSegmentedControl.podspec b/SJFluidSegmentedControl.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name             = 'SJFluidSegmentedControl'
-s.version          = '1.1.2'
+s.version          = '1.1.3'
 s.summary          = 'A segmented control with custom appearance and interactive animations.'
 
 s.description      = <<-DESC

diff --git a/SJFluidSegmentedControl/Classes/SJFluidSegmentedControl.swift b/SJFluidSegmentedControl/Classes/SJFluidSegmentedControl.swift
@@ -344,7 +344,7 @@ public class SJFluidSegmentedControl: UIView, UIGestureRecognizerDelegate {
                                                 toItem: self, attribute: .left,
                                                 multiplier: 1.0,
                                                 constant: 0.0)
-        leftConstraint.priority = UILayoutPriorityDefaultHigh
+        leftConstraint.priority = UILayoutPriority.defaultHigh
         self.addConstraint(leftConstraint)
         self.addConstraint(NSLayoutConstraint(item: $0, attribute: .right,
                                               relatedBy: .equal,
@@ -373,7 +373,7 @@ public class SJFluidSegmentedControl: UIView, UIGestureRecognizerDelegate {
                                                  toItem: self, attribute: .right,
                                                  multiplier: 1.0,
                                                  constant: 0.0)
-        rightConstraint.priority = UILayoutPriorityDefaultHigh
+        rightConstraint.priority = UILayoutPriority.defaultHigh
         self.addConstraint(rightConstraint)
         self.addConstraint(NSLayoutConstraint(item: $0, attribute: .left,
                                               relatedBy: .equal,
@@ -990,7 +990,8 @@ public class SJFluidSegmentedControl: UIView, UIGestureRecognizerDelegate {
             colors = [gradientBounceColor]
         }
         if colors!.count == 1 {
-            colors?.append((colors?.first)!)
+            let firstColor = (colors?.first)!
+            colors?.append(firstColor)
         }
         return colors!
     }