Merge branch 'feature/mxsegmentedcontrol'

Author: maxep

.gitignore

@@ -2,33 +2,11 @@
 .DS_Store
 
 # Xcode
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
 xcuserdata
-*.xccheckout
-profile
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
 
 # Bundler
 .bundle
 
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-# 
-# Note: if you ignore the Pods directory, make sure to uncomment
-# `pod install` in .travis.yml
-#
-# Pods/
-Example/MXSegmentedPager.xcworkspace
-Example-Swift/MXSegmentedPager-Swift.xcworkspace
+# Carthage
+Carthage/Checkouts
+*.bcsymbolmap

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode10.2
 
 env: 
   global:
@@ -11,13 +11,13 @@ before_install:
 
 install:
 - gem install cocoapods
-- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+- gem install xcpretty --no-document --quiet
 
 before_script:
 - carthage bootstrap
 
 script:
-- set -o pipefail && xcodebuild -project MXSegmentedPager.xcodeproj -scheme $FRAMEWORK_NAME -sdk iphonesimulator10.3 -configuration Release | xcpretty -c
+- set -o pipefail && xcodebuild -project MXSegmentedPager.xcodeproj -scheme $FRAMEWORK_NAME -sdk iphonesimulator12.2 -configuration Release | xcpretty -c
 - pod lib lint --quick
 
 before_deploy:

Cartfile

@@ -1,3 +1,3 @@
-github "maxep/MXPagerView" "0.2.1"
-github "maxep/HMSegmentedControl" "master"
-github "maxep/MXParallaxHeader" "0.6.1"
+github "maxep/MXPagerView" ~> 0.2
+github "maxep/MXSegmentedControl" ~> 1.1
+github "maxep/MXParallaxHeader" ~> 1.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "maxep/HMSegmentedControl" "7c97e5501100b5389398ea6f2e57ae9785287b9e"
 github "maxep/MXPagerView" "0.2.1"
-github "maxep/MXParallaxHeader" "0.6.1"
+github "maxep/MXParallaxHeader" "1.0.0"
+github "maxep/MXSegmentedControl" "1.1.0"