Updated to Swift 4

jimmyti · Dec 7, 2017 · 5f4ebd9 · 5f4ebd9
1 parent 65f59c5
commit 5f4ebd9
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 27 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
-  - SwiftyOnboard (1.3.4)
+  - SwiftyOnboard (1.3.5)
 
 DEPENDENCIES:
   - SwiftyOnboard
 
 SPEC CHECKSUMS:
-  SwiftyOnboard: 05d2fd80cbedc43b62d190e45b94455f73bda226
+  SwiftyOnboard: 01615b68f93d071511e952899563aae0f94f3713
 
 PODFILE CHECKSUM: 79bb0b536df239d044c550ad3debbb51feb11053
 

diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/SwiftyOnboard/SwiftyOnboard/SwiftyOnboard.swift b/Example/Pods/SwiftyOnboard/SwiftyOnboard/SwiftyOnboard.swift
diff --git a/Example/Pods/Target Support Files/SwiftyOnboard/Info.plist b/Example/Pods/Target Support Files/SwiftyOnboard/Info.plist
diff --git a/Example/SwiftyOnboardExample/Base.lproj/Main.storyboard b/Example/SwiftyOnboardExample/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -25,6 +25,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="273" y="139"/>
         </scene>
         <!--Storyboard Example View Controller-->
         <scene sceneID="Y2J-Ws-bIH">

diff --git a/SwiftyOnboard.xcodeproj/project.pbxproj b/SwiftyOnboard.xcodeproj/project.pbxproj
@@ -158,12 +158,13 @@
 					69A629FA1E885750009788A2 = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = V92SZ8966T;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0910;
 						ProvisioningStyle = Automatic;
 					};
 					69A62A031E885750009788A2 = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = V92SZ8966T;
+						LastSwiftMigration = 0910;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -350,7 +351,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -371,7 +373,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.juanpablofernandez.SwiftyOnboard;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -384,7 +387,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.juanpablofernandez.SwiftyOnboardTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -397,7 +401,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.juanpablofernandez.SwiftyOnboardTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/SwiftyOnboard/SwiftyOnboard.swift b/SwiftyOnboard/SwiftyOnboard.swift
@@ -160,7 +160,7 @@ public class SwiftyOnboard: UIView, UIScrollViewDelegate {
         }
     }
 
-    internal func tappedPage() {
+    @objc internal func tappedPage() {
         let currentpage = Int(getCurrentPosition())
         self.delegate?.swiftyOnboard(self, tapped: currentpage)
     }
@@ -213,7 +213,7 @@ public class SwiftyOnboard: UIView, UIScrollViewDelegate {
         }
     }
 
-    open func didTapPageControl(_ sender: Any) {
+    @objc open func didTapPageControl(_ sender: Any) {
         let pager = sender as! UIPageControl
         let page = pager.currentPage
         self.goToPage(index: page, animated: true)