Update to swift 2.2

marciliojrs · Apr 5, 2016 · 586610d · 586610d
1 parent eb8fbd2
commit 586610d
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 85 deletions.
diff --git a/BWWalkthrough.podspec b/BWWalkthrough.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "BWWalkthrough"
-  s.version          = "1.0.1"
+  s.version          = "1.0.2"
   s.summary          = "Generate custom walkthroughs for your apps."
   s.homepage         = "https://github.com/ariok/BWWalkthrough"
   s.license          = 'MIT'

diff --git a/Example/BWWalkthrough.xcodeproj/xcshareddata/xcschemes/BWWalkthrough-Example.xcscheme b/Example/BWWalkthrough.xcodeproj/xcshareddata/xcschemes/BWWalkthrough-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BWWalkthrough.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BWWalkthrough.xcscheme
diff --git a/Example/Pods/Target Support Files/BWWalkthrough/Info.plist b/Example/Pods/Target Support Files/BWWalkthrough/Info.plist
diff --git a/Example/Pods/Target Support Files/Pods-BWWalkthrough_Example/Info.plist b/Example/Pods/Target Support Files/Pods-BWWalkthrough_Example/Info.plist
diff --git a/Example/Pods/Target Support Files/Pods-BWWalkthrough_Tests/Info.plist b/Example/Pods/Target Support Files/Pods-BWWalkthrough_Tests/Info.plist
diff --git a/Pod/Classes/BWWalkthroughPageViewController.swift b/Pod/Classes/BWWalkthroughPageViewController.swift
@@ -88,7 +88,7 @@ public class BWWalkthroughPageViewController: UIViewController, BWWalkthroughPag
 
     public func walkthroughDidScroll(position: CGFloat, offset: CGFloat) {
 
-        for(var i = 0; i < subsWeights.count ;i++){
+        for i in 0 ..< subsWeights.count{
 
             // Perform Transition/Scale/Rotate animations
             switch animation{
@@ -116,13 +116,13 @@ public class BWWalkthroughPageViewController: UIViewController, BWWalkthroughPag
 
     // MARK: Animations (WIP)
 
-    private func animationAlpha(index:Int, var _ offset:CGFloat){
+    private func animationAlpha(index:Int, _ offset:CGFloat){
         let cView = view.subviews[index] 
-
-        if(offset > 1.0){
-            offset = 1.0 + (1.0 - offset)
+        var mutableOffset = offset
+        if(mutableOffset > 1.0){
+            mutableOffset = 1.0 + (1.0 - mutableOffset)
         }
-        cView.alpha = (offset)
+        cView.alpha = (mutableOffset)
     }
 
     private func animationCurve(index:Int, _ offset:CGFloat){

diff --git a/Pod/Classes/BWWalkthroughViewController.swift b/Pod/Classes/BWWalkthroughViewController.swift
@@ -122,7 +122,7 @@ At the moment it's only used to perform custom animations on didScroll.
 
         // Initialize UI Elements
 
-        pageControl?.addTarget(self, action: "pageControlDidTouch", forControlEvents: UIControlEvents.TouchUpInside)
+        pageControl?.addTarget(self, action: #selector(BWWalkthroughViewController.pageControlDidTouch), forControlEvents: UIControlEvents.TouchUpInside)
 
         // Scrollview
 
@@ -269,7 +269,7 @@ At the moment it's only used to perform custom animations on didScroll.
 
     public func scrollViewDidScroll(sv: UIScrollView) {
 
-        for var i=0; i < controllers.count; i++ {
+        for i in 0 ..< controllers.count {
 
             if let vc = controllers[i] as? BWWalkthroughPage{