Merge pull request #570 from Nixsm/master

Martin Barreto · web-flow · commit 2351f06987b9 · 2018-04-10T14:22:33.000-03:00
Removing deprecated flatMap
diff --git a/Sources/ButtonBarPagerTabStripViewController.swift b/Sources/ButtonBarPagerTabStripViewController.swift
@@ -259,11 +259,11 @@ open class ButtonBarPagerTabStripViewController: PagerTabStripViewController, Pa
 
         if reload {
             let indexPathsToReload = cells.enumerated()
-                .flatMap { (arg) -> IndexPath? in
+                .compactMap { (arg) -> IndexPath? in
                     let (index, cell) = arg
                     return cell == nil ? indexPaths[index] : nil
                 }
-                .flatMap { (indexPath: IndexPath) -> IndexPath? in
+                .compactMap { (indexPath: IndexPath) -> IndexPath? in
                     return (indexPath.item >= 0 && indexPath.item < buttonBarView.numberOfItems(inSection: indexPath.section)) ? indexPath : nil
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -259,11 +259,11 @@ open class ButtonBarPagerTabStripViewController: PagerTabStripViewController, Pa`
`259`	`259`
`260`	`260`	`if reload {`
`261`	`261`	`let indexPathsToReload = cells.enumerated()`
`262`		`- .flatMap { (arg) -> IndexPath? in`
	`262`	`+ .compactMap { (arg) -> IndexPath? in`
`263`	`263`	`let (index, cell) = arg`
`264`	`264`	`return cell == nil ? indexPaths[index] : nil`
`265`	`265`	`}`
`266`		`- .flatMap { (indexPath: IndexPath) -> IndexPath? in`
	`266`	`+ .compactMap { (indexPath: IndexPath) -> IndexPath? in`
`267`	`267`	`return (indexPath.item >= 0 && indexPath.item < buttonBarView.numberOfItems(inSection: indexPath.section)) ? indexPath : nil`
`268`	`268`	`}`
`269`	`269`