Merge pull request #81 from kazuhiro4949/feature/fix_warning

fix warning

Author: kazuhiro4949

PagingKit.xcodeproj/project.pbxproj

@@ -186,6 +186,7 @@
 					};
 					6EC140C31F0940F40054B514 = {
 						CreatedOnToolsVersion = 8.3.3;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -441,7 +442,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = kazuhiro.hayashi.PagingKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -456,7 +458,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = kazuhiro.hayashi.PagingKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

PagingKit/PagingMenuView.swift

@@ -459,7 +459,7 @@ open class PagingMenuView: UIScrollView {
         let currentOffset = contentOffset
         let contentWidth = contentSize.width
         let centerOffsetX = (contentWidth - bounds.size.width) / 2
-        let distanceFromCenter = fabs(currentOffset.x - centerOffsetX)
+        let distanceFromCenter = abs(currentOffset.x - centerOffsetX)
 
         if distanceFromCenter > (contentWidth - bounds.size.width) / 4 {
             contentOffset = CGPoint(x: centerOffsetX, y: currentOffset.y)

PagingKitTests/PagingMenuViewControllerTests.swift

@@ -132,14 +132,14 @@ class PagingMenuViewControllerTests: XCTestCase {
 
         menuViewController.reloadData()
 
-        let indices = menuViewController.visibleCells.flatMap { $0.index }
+        let indices = menuViewController.visibleCells.compactMap { $0.index }
         let randamizedScrollOrder = (0..<10).map { _ in Int(arc4random_uniform(UInt32(indices.last ?? 0))) }
         var resultOrder = [Int?]()
         for i in randamizedScrollOrder {
             menuViewController.scroll(index: i, animated: false)
             resultOrder.append(menuViewController.currentFocusedCell?.index)
         }
-        let actualScrollOrder = resultOrder.flatMap{ $0 }
+        let actualScrollOrder = resultOrder.compactMap{ $0 }
         XCTAssertEqual(actualScrollOrder, randamizedScrollOrder, "focus correct cell")
     }
 

PagingKitTests/PagingMenuViewTests.swift

@@ -146,7 +146,7 @@ class PagingMenuViewTests: XCTestCase {
         pagingMenuView.dataSource = dataSource
         pagingMenuView.reloadData()
 
-        let actualRects = (0..<dataSource.data.count).flatMap(pagingMenuView.rectForItem)
+        let actualRects = (0..<dataSource.data.count).compactMap(pagingMenuView.rectForItem)
         let expectedRects = Array(stride(from: 0, to: 2000, by: 100)).map { CGRect(x: $0, y: 0, width: 100, height: 44) }
         XCTAssertEqual(actualRects,
                        expectedRects, "get correct rect")
@@ -279,7 +279,7 @@ class PagingMenuViewTests: XCTestCase {
 
                 let cellIndice = pagingMenuView
                     .visibleCells
-                    .flatMap(pagingMenuView.containerView.subviews.index(of:))
+                    .compactMap(pagingMenuView.containerView.subviews.index(of:))
 
                 let aboveIndices = cellIndice.filter { Int($0) > Int(focusViewIndex) }
                 XCTAssertEqual(aboveIndices.count, 0, "focus view is in front of cell")
@@ -298,7 +298,7 @@ class PagingMenuViewTests: XCTestCase {
 
                 let cellIndice = pagingMenuView
                     .visibleCells
-                    .flatMap(pagingMenuView.containerView.subviews.index(of:))
+                    .compactMap(pagingMenuView.containerView.subviews.index(of:))
 
                 let aboveIndices = cellIndice.filter { Int($0) > Int(focusViewIndex) }
                 XCTAssertEqual(aboveIndices.count, 0, "focus view is in front of cell")