Merge branch 'release/0.2.0'

bcylin · Sep 17, 2015 · 0a8fca5 · 0a8fca5
2 parents 76f71e9 + 79af307
commit 0a8fca5
Show file tree

Hide file tree

Showing 39 changed files with 1,381 additions and 708 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,7 +26,9 @@ Icon?
 ehthumbs.db
 Thumbs.db
 
+# Carthage
+Carthage
+
 # CocoaPods
 Pods
-*.xcworkspace
 
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,13 @@
 language: objective-c
+osx_image: xcode6.4
 before_install:
-  - "brew update; brew upgrade xctool"
-  - "gem install cocoapods --no-rdoc --no-ri"
-before_script:
-  - "export LANG=en_US.UTF-8"
-  - "cd Demo"
+  - if test -z $(brew list | grep -i xcproj); then brew install xcproj; fi
+  - export LANG=en_US.UTF-8
+install:
+  - bundle install --without development --deployment --jobs=3 --retry=3
+  - bundle exec pod install
 script:
-  - "xctool -project NEUPagingSegmentedControlDemo.xcodeproj -scheme NEUPagingSegmentedControlDemo -sdk iphonesimulator build"
+  - xctool -workspace NEUPagingSegmentedControl.xcworkspace -scheme NEUPagingSegmentedControl-iOS -sdk iphonesimulator clean build
+  - xctool -workspace NEUPagingSegmentedControl.xcworkspace -scheme Example -sdk iphonesimulator clean build
+notifications:
+  email: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## Version 0.2.0
+
+#### Added
+
+* Local development pods
+* [Carthage](https://github.com/Carthage/Carthage) support
+* A public readonly `indicatorView`
+  * Updated by [Yen](https://github.com/yenchenlin1994) in Pull Request #2
+
+#### Fixed
+
+* Fix the area used in `- drawRect:`
+* Fix the key-value observer compliance
+
 ## Version 0.1.0
 
-* First release
+* Initial release
diff --git a/Demo/NEUPagingSegmentedControlDemo.xcodeproj/project.pbxproj b/Demo/NEUPagingSegmentedControlDemo.xcodeproj/project.pbxproj
diff --git a/Demo/NEUPagingSegmentedControlDemo/Images.xcassets/LaunchImage.launchimage/Contents.json b/Demo/NEUPagingSegmentedControlDemo/Images.xcassets/LaunchImage.launchimage/Contents.json
diff --git a/Demo/NEUPagingSegmentedControlDemo/NEUPagingSegmentedControlDemo-Prefix.pch b/Demo/NEUPagingSegmentedControlDemo/NEUPagingSegmentedControlDemo-Prefix.pch
diff --git a/Demo/NEUPagingSegmentedControlDemo/en.lproj/InfoPlist.strings b/Demo/NEUPagingSegmentedControlDemo/en.lproj/InfoPlist.strings
diff --git a/Demo/NEUPagingSegmentedControlDemoTests/NEUPagingSegmentedControlDemoTests.m b/Demo/NEUPagingSegmentedControlDemoTests/NEUPagingSegmentedControlDemoTests.m
diff --git a/Demo/NEUPagingSegmentedControlDemoTests/en.lproj/InfoPlist.strings b/Demo/NEUPagingSegmentedControlDemoTests/en.lproj/InfoPlist.strings