Skip to content

Commit

Permalink
Merge pull request #196 from Orderella/development
Browse files Browse the repository at this point in the history
Switched to DynamicBlurView
  • Loading branch information
mwfire committed Jan 14, 2018
2 parents e40044f + 91d634b commit d974979
Show file tree
Hide file tree
Showing 54 changed files with 1,717 additions and 1,426 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ language: objective-c
osx_image: xcode9.1
env:
global:
- WORKSPACE=Example/PopupDialog.xcworkspace
- IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
- IOS_SDK=iphonesimulator11.1
- EXAMPLE_SCHEME="PopupDialog-Example"
- WORKSPACE=Example/PopupDialog.xcworkspace
- IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
- IOS_SDK=iphonesimulator11.1
- EXAMPLE_SCHEME="PopupDialog-Example"
matrix:
- DESTINATION="OS=11.1,name=iPhone 7 Plus" SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-7-Plus, 11.1" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
- 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"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog

* **0.7.0** Removed FXBlurView while switching to DynamicBlurView
* **0.6.2** Added preferredWidth option for iPads
* **0.6.1** Added shake animation<br>Introduced hideStatusBar option
* **0.6.0** Swift 4 support<br>Dropped iOS8 compatibility
Expand Down
7 changes: 5 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
PODS:
- DynamicBlurView (2.0.0)
- FBSnapshotTestCase (2.1.4):
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
- FBSnapshotTestCase/Core (2.1.4)
- FBSnapshotTestCase/SwiftSupport (2.1.4):
- FBSnapshotTestCase/Core
- Nimble (7.0.2)
- PopupDialog (0.6.2)
- PopupDialog (0.7.0):
- DynamicBlurView (~> 2.0)
- SwiftLint (0.24.0)

DEPENDENCIES:
Expand All @@ -27,9 +29,10 @@ CHECKOUT OPTIONS:
:git: https://github.com/facebook/ios-snapshot-test-case.git

SPEC CHECKSUMS:
DynamicBlurView: 7b1bfbc1e7a0606b8a1855ff809ccaccfbda6b30
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
PopupDialog: 4249a2fa2c2552b99cc74b245544701714162ae4
PopupDialog: b59d5a92b015dde35a1af6aacf19e960f432aef8
SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba

PODFILE CHECKSUM: 7a27ac877c3a93aa83583a4625417841e72145e5
Expand Down
131 changes: 131 additions & 0 deletions Example/Pods/DynamicBlurView/DynamicBlurView/BlurLayer.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions Example/Pods/DynamicBlurView/DynamicBlurView/CaptureQuality.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Example/Pods/DynamicBlurView/DynamicBlurView/DynamicBlurView.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d974979

Please sign in to comment.