From 945d6eab5bd0fb117ec7866fd4983878ccbb22af Mon Sep 17 00:00:00 2001 From: tailec Date: Tue, 2 Feb 2016 19:08:00 +0000 Subject: [PATCH 1/2] Small crash fix. Resolves #113 --- Sources/ButtonBarPagerTabStripViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/ButtonBarPagerTabStripViewController.swift b/Sources/ButtonBarPagerTabStripViewController.swift index 2bad00d..6b71aff 100644 --- a/Sources/ButtonBarPagerTabStripViewController.swift +++ b/Sources/ButtonBarPagerTabStripViewController.swift @@ -240,8 +240,8 @@ public class ButtonBarPagerTabStripViewController: PagerTabStripViewController, buttonBarView.moveToIndex(indexPath.item, animated: true, swipeDirection: .None, pagerScroll: .Yes) shouldUpdateButtonBarView = false - let oldCell = buttonBarView.cellForItemAtIndexPath(NSIndexPath(forItem: currentIndex, inSection: 0)) as! ButtonBarViewCell - let newCell = buttonBarView.cellForItemAtIndexPath(NSIndexPath(forItem: indexPath.item, inSection: 0)) as! ButtonBarViewCell + let oldCell = buttonBarView.cellForItemAtIndexPath(NSIndexPath(forItem: currentIndex, inSection: 0)) as? ButtonBarViewCell + let newCell = buttonBarView.cellForItemAtIndexPath(NSIndexPath(forItem: indexPath.item, inSection: 0)) as? ButtonBarViewCell if pagerBehaviour.isProgressiveIndicator { if let changeCurrentIndexProgressive = changeCurrentIndexProgressive { changeCurrentIndexProgressive(oldCell: oldCell, newCell: newCell, progressPercentage: 1, changeCurrentIndex: true, animated: true) From 241dc2d4423e363c08904e5cf1648b5c6b156a14 Mon Sep 17 00:00:00 2001 From: Martin Barreto Date: Tue, 2 Feb 2016 22:38:13 -0300 Subject: [PATCH 2/2] fix travis CI issue --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ffcc4a..549910f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ osx_image: xcode7.2 before_install: - brew update -- brew install carthage +- brew outdated carthage || brew upgrade carthage - if brew outdated | grep -qx xctool; then brew upgrade xctool; fi - carthage update --platform iOS - gem install xcpretty --no-rdoc --no-ri --no-document --quiet