Skip to content

Commit

Permalink
Merge pull request #148 from xmartlabs/version_5_0_0
Browse files Browse the repository at this point in the history
Xcode 7.3 support. Now Swift 2.2 is required.
  • Loading branch information
Martin Barreto committed Mar 23, 2016
2 parents ea31f3f + f9c767f commit c8bcc9a
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 13 deletions.
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Before submitting issues ...

- Make sure you are using XLPagerTabStrip [latest release](https://github.com/xmartlabs/XLPagerTabStrip/releases) or master branch version.
- Make sure your Xcode version is the latest stable one.
- Check if the issue was [already reported or fixed](https://github.com/xmartlabs/XLPagerTabStrip/issues?utf8=%E2%9C%93&q=is%3Aissue). We add labels to each issue in order to easily find related issues. If you found a match add a brief comment "I have the same problem" or "+1".

When submitting issues, please provide the following information to help maintainers to fix the problem faster:

- Environment: XLPagerTabStrip, Xcode and iOS version you are using.
- In case of reporting errors, provide Xcode console output of stack trace or code compilation error.
- Any other additional detail such as example code that you think it would be useful to understand, reproduce and solve the problem.
Empty file.
15 changes: 9 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
language: objective-c
osx_image: xcode7.2

osx_image: xcode7.3
env:
- DESTINATION="OS=9.3,name=iPhone 6s" SCHEME="XLPagerTabStrip" SDK=iphonesimulator9.3
before_install:
- brew update
- brew outdated carthage || brew upgrade carthage
#- brew outdated carthage || brew upgrade carthage
- if brew outdated | grep -qx xctool; then brew upgrade xctool; fi
- carthage update --platform iOS
#- carthage update --platform iOS
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet

script:
- xctool clean build -project XLPagerTabStrip.xcodeproj -scheme XLPagerTabStrip -sdk iphonesimulator
- xctool test -project XLPagerTabStrip.xcodeproj -scheme XLPagerTabStrip -sdk iphonesimulator
- xctool clean build -project XLPagerTabStrip.xcodeproj -scheme XLPagerTabStrip -sdk iphonesimulator9.3
#- xctool test -project XLPagerTabStrip.xcodeproj -scheme XLPagerTabStrip -sdk iphonesimulator9.3
- xcodebuild -project XLPagerTabStrip.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION"
-configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log
All notable changes to XLPagerTabStrip will be documented in this file.

### [5.0.0](https://github.com/xmartlabs/XLPagerTabStrip/releases/tag/5.0.0)

* Xcode 7.3 support.
* Bug fixes and stability improvements.

### [4.0.2](https://github.com/xmartlabs/XLPagerTabStrip/releases/tag/4.0.2)

* Bug fixes
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<img src="https://img.shields.io/badge/platform-iOS-blue.svg?style=flat" alt="Platform iOS" />
<a href="https://developer.apple.com/swift"><img src="https://img.shields.io/badge/swift2-compatible-4BC51D.svg?style=flat" alt="Swift 2 compatible" /></a>
<a href="https://github.com/Carthage/Carthage"><img src="https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat" alt="Carthage compatible" /></a>
<a href="https://cocoapods.org/pods/XLActionController"><img src="https://img.shields.io/badge/pod-4.0.2-blue.svg" alt="CocoaPods compatible" /></a>
<a href="https://cocoapods.org/pods/XLActionController"><img src="https://img.shields.io/badge/pod-5.0.0-blue.svg" alt="CocoaPods compatible" /></a>
<a href="https://raw.githubusercontent.com/xmartlabs/XLPagerTabStrip/master/LICENSE"><img src="http://img.shields.io/badge/license-MIT-blue.svg?style=flat" alt="License: MIT" />
<a href="https://codebeat.co/projects/github-com-xmartlabs-xlpagertabstrip"><img alt="codebeat badge" src="https://codebeat.co/badges/f32c9ad3-0aa1-4b40-a632-9421211bd39e" /></a>
</a>
Expand Down Expand Up @@ -287,7 +287,7 @@ settings.style.segmentedControlColor: UIColor?
## Requirements

* iOS 8.0+
* Xcode 7.2+
* Xcode 7.3+

## Examples

Expand All @@ -302,7 +302,7 @@ Follow these 3 steps to run Example project: Clone XLPagerTabStrip repository, o
To install XLPagerTabStrip, simply add the following line to your Podfile:

```ruby
pod 'XLPagerTabStrip', '~> 4.0'
pod 'XLPagerTabStrip', '~> 5.0'
```

### Carthage
Expand All @@ -312,7 +312,7 @@ pod 'XLPagerTabStrip', '~> 4.0'
To install XLPagerTabStrip, simply add the following line to your Cartfile:

```ogdl
github "xmartlabs/XLPagerTabStrip" ~> 4.0
github "xmartlabs/XLPagerTabStrip" ~> 5.0
```

## FAQ
Expand Down
2 changes: 1 addition & 1 deletion Sources/SegmentedPagerTabStripViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class SegmentedPagerTabStripViewController: PagerTabStripViewController,
navigationItem.titleView = segmentedControl
}
segmentedControl.tintColor = settings.style.segmentedControlColor ?? segmentedControl.tintColor
segmentedControl.addTarget(self, action: "segmentedControlChanged:", forControlEvents: .ValueChanged)
segmentedControl.addTarget(self, action: #selector(SegmentedPagerTabStripViewController.segmentedControlChanged(_:)), forControlEvents: .ValueChanged)
reloadSegmentedControl()
}

Expand Down
2 changes: 1 addition & 1 deletion XLPagerTabStrip.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "XLPagerTabStrip"
s.version = "4.0.2"
s.version = "5.0.0"
s.summary = "Android PagerTabStrip for iOS and much more."
s.homepage = "https://github.com/xmartlabs/XLPagerTabStrip"
s.license = { type: 'MIT', file: 'LICENSE' }
Expand Down
2 changes: 1 addition & 1 deletion XLPagerTabStrip/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>4.0.2</string>
<string>5.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit c8bcc9a

Please sign in to comment.