Skip to content

Commit

Permalink
Merge pull request #65 from iosphere/feature/1.0.6
Browse files Browse the repository at this point in the history
Prepare 1.0.6 release
  • Loading branch information
Hagi committed Dec 5, 2017
2 parents da7a484 + 660d17a commit b7e0bec
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
language: objective-c
osx_image: xcode8
osx_image: xcode9.1

install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet

script:
- set -o pipefail
# build sample app for simulator (also builds framework)
- xcodebuild -project ISHPullUpSample/ISHPullUpSample.xcodeproj -scheme ISHPullUpSample -destination 'platform=iOS Simulator,name=iPhone 6' clean build | xcpretty
- xcodebuild -project ISHPullUpSample/ISHPullUpSample.xcodeproj -scheme ISHPullUpSample -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.1' clean build | xcpretty
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# <img src="icon.png" align="center" width="60" height="60"> Changelog

## 1.0.6

* Add support and documentation for iOS 11 insets
* Add support for iPhone X
* Add option to hide bottom view controller
* Fix type of `bottomHiddenMargin` to allow custom margins
* Require Xcode 9

## 1.0.5

* Support view controller containment: `ISHPullUpViewController` (or subclasses thereof) can now be embedded in container view controllers that make use of the bottom layout guide (e.g., `UITabBarController`)
Expand Down
2 changes: 1 addition & 1 deletion ISHPullUp.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = 'ISHPullUp'
s.version = '1.0.5'
s.version = '1.0.6'
s.summary = 'Vertical split view controller with pull up gesture as seen in the iOS 10 Maps and Music app'
s.description = <<-DESC
ISHPullUp provides a simple UIViewControlller subclass with two child controllers. The layout can be managed entirely via delegation and is easy to use with autolayout. A pan gesture allows the user to drag the bottom view controller up or down.
Expand Down
4 changes: 2 additions & 2 deletions ISHPullUp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 6;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -245,7 +245,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 6;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down

0 comments on commit b7e0bec

Please sign in to comment.