Skip to content

Commit e5fd011

Browse files
authored
Merge pull request #182 from Orderella/development
Development Version 0.6.1
2 parents 355e048 + 6bdd8e6 commit e5fd011

File tree

45 files changed

+158
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+158
-81
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ Carthage
3131
# `pod install` in .travis.yml
3232
#
3333
# Pods/
34+
.idea

.travis.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,21 @@ env:
77
- IOS_SDK=iphonesimulator11.0
88
- EXAMPLE_SCHEME="PopupDialog-Example"
99
matrix:
10-
- DESTINATION="OS=11.0,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
11-
- DESTINATION="OS=10.2,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
12-
- DESTINATION="OS=9.2,name=iPhone 5s" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
10+
- DESTINATION="OS=11.0,name=iPhone 7 Plus" SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-7-Plus, 11.0" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
11+
- DESTINATION="OS=10.2,name=iPhone 6" SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-6, 10.2" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
12+
- DESTINATION="OS=9.2,name=iPhone 5s" SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-5s, 9.2" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
1313
before_install:
14+
- npm install ios-sim -g
1415
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
1516
- pod install --project-directory=./Example --repo-update
1617
script:
1718
- set -o pipefail
1819
- xcodebuild -version
1920
- xcodebuild -showsdks
21+
- xcrun simctl list
22+
23+
# "Prewarm" simulators as of https://github.com/travis-ci/travis-ci/issues/6675
24+
- ios-sim start --devicetypeid "$SIMNAME"
2025

2126
# Build Framework in Debug and Run Tests if specified
2227
- if [ $RUN_TESTS == "YES" ]; then

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changelog
22

3+
* **0.6.1** Added shake animation<br>Introduced hideStatusBar option
34
* **0.6.0** Swift 4 support<br>Dropped iOS8 compatibility
45
* **0.5.4** Fixed bug where blur view would reveal hidden layer<br>Improved view controller lifecycle handling<br>Scroll views can now be used with gesture dismissal
56
* **0.5.3** Fixed memory leak with custom view controllers<br>Added UI automation & snapshot tests

Example/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ PODS:
55
- FBSnapshotTestCase/SwiftSupport (2.1.4):
66
- FBSnapshotTestCase/Core
77
- Nimble (7.0.2)
8-
- PopupDialog (0.6.0)
9-
- SwiftLint (0.22.0)
8+
- PopupDialog (0.6.1)
9+
- SwiftLint (0.24.0)
1010

1111
DEPENDENCIES:
1212
- FBSnapshotTestCase (from `https://github.com/facebook/ios-snapshot-test-case.git`, commit `ed4e6a6`)
@@ -29,8 +29,8 @@ CHECKOUT OPTIONS:
2929
SPEC CHECKSUMS:
3030
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
3131
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
32-
PopupDialog: 6382b868ea57e78032725d54a4dfbc57d27f7281
33-
SwiftLint: 1134786caedd2caab0560d2f36b76414a5a56808
32+
PopupDialog: 89e5f9eeb724de17438559f413e2f6d286d2b88d
33+
SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
3434

3535
PODFILE CHECKSUM: 7a27ac877c3a93aa83583a4625417841e72145e5
3636

Example/Pods/Local Podspecs/PopupDialog.podspec.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/SwiftLint/SwiftLintFramework.framework/Versions/A/Frameworks/Commandant.framework/Versions/A/Resources/Info.plist

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/SwiftLint/SwiftLintFramework.framework/Versions/A/Frameworks/Result.framework/Versions/A/Resources/Info.plist

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)