Skip to content

Commit

Permalink
Merge pull request #270 from Orderella/Swift4.2
Browse files Browse the repository at this point in the history
Swift4.2
  • Loading branch information
mwfire authored Sep 27, 2018
2 parents cbaddf4 + 3cdaf46 commit b0bd3b4
Show file tree
Hide file tree
Showing 77 changed files with 1,132 additions and 1,166 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
4.2
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: objective-c
osx_image: xcode9.1
osx_image: xcode10
env:
global:
- WORKSPACE=Example/PopupDialog.xcworkspace
- IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
- IOS_SDK=iphonesimulator11.1
- IOS_SDK=iphonesimulator12.0
- 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"
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Changelog

* **0.9.0** Swift 4.2 support
* **0.8.1** Added shadow appearance properties
* **0.8.0** Separated tap and pan gesture dismissal
* **0.7.1** Fixes Objective-C compatability<br>Improved Carthage handling
Expand All @@ -9,7 +10,7 @@
* **0.6.0** Swift 4 support<br>Dropped iOS8 compatibility
* **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
* **0.5.3** Fixed memory leak with custom view controllers<br>Added UI automation & snapshot tests
* **0.5.2** Fixed image scaling for default view
* **0.5.2** Fixed image scaling for default view
* **0.5.1** Introduced custom button height parameter<br>Reintroduced iOS8 compatibility
* **0.5.0** Swift 3 compatibility / removed iOS8
* **0.4.0** iOS 8 compatibility
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "KyoheiG3/DynamicBlurView" ~> 2.0
github "KyoheiG3/DynamicBlurView" ~> 3.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "KyoheiG3/DynamicBlurView" "2.0.2"
github "KyoheiG3/DynamicBlurView" "3.0.1"
6 changes: 4 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
platform :ios, '9.0'
use_frameworks!

ENV['COCOAPODS_DISABLE_STATS'] = "true" ## This disabled the Sending Stats when running Pod install in terminal

target 'PopupDialog_Example' do

pod 'PopupDialog', :path => '../'
Expand All @@ -9,8 +11,8 @@ target 'PopupDialog_Example' do
target 'PopupDialog_Tests' do
inherit! :search_paths

pod 'Nimble', '~> 7.0.2'
pod 'FBSnapshotTestCase', :git => 'https://github.com/facebook/ios-snapshot-test-case.git', :commit => 'ed4e6a6'
pod 'Nimble', '~> 7.3.1'
pod 'FBSnapshotTestCase', '~> 2.1.4'

end
end
29 changes: 11 additions & 18 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,46 +1,39 @@
PODS:
- DynamicBlurView (2.0.2)
- DynamicBlurView (3.0.1)
- FBSnapshotTestCase (2.1.4):
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
- FBSnapshotTestCase/Core (2.1.4)
- FBSnapshotTestCase/SwiftSupport (2.1.4):
- FBSnapshotTestCase/Core
- Nimble (7.0.3)
- PopupDialog (0.8.1):
- DynamicBlurView (~> 2.0)
- Nimble (7.3.1)
- PopupDialog (0.9.0):
- DynamicBlurView (~> 3.0.1)
- SwiftLint (0.27.0)

DEPENDENCIES:
- FBSnapshotTestCase (from `https://github.com/facebook/ios-snapshot-test-case.git`, commit `ed4e6a6`)
- Nimble (~> 7.0.2)
- FBSnapshotTestCase (~> 2.1.4)
- Nimble (~> 7.3.1)
- PopupDialog (from `../`)
- SwiftLint (~> 0.22)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- DynamicBlurView
- FBSnapshotTestCase
- Nimble
- SwiftLint

EXTERNAL SOURCES:
FBSnapshotTestCase:
:commit: ed4e6a6
:git: https://github.com/facebook/ios-snapshot-test-case.git
PopupDialog:
:path: "../"

CHECKOUT OPTIONS:
FBSnapshotTestCase:
:commit: ed4e6a6
:git: https://github.com/facebook/ios-snapshot-test-case.git

SPEC CHECKSUMS:
DynamicBlurView: aa6db4defc6e537eb86fc5e58dd3991666178399
DynamicBlurView: b1df5415f9bd31897549e5d7077e5ec120a4d636
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
PopupDialog: 8d69f3c44b2ebde5a45fe64546bf4ee0d574d763
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
PopupDialog: d0eb441a6a0a84b054456ddf6ecc3fd3d2a6f332
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073

PODFILE CHECKSUM: 7a27ac877c3a93aa83583a4625417841e72145e5
PODFILE CHECKSUM: 2d0166d1e20a1e39377fb316142d39a3785d58f2

COCOAPODS: 1.5.3

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.

4 changes: 2 additions & 2 deletions Example/Pods/DynamicBlurView/README.md

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

6 changes: 3 additions & 3 deletions Example/Pods/Local Podspecs/PopupDialog.podspec.json

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

29 changes: 11 additions & 18 deletions Example/Pods/Manifest.lock

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.

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

Loading

0 comments on commit b0bd3b4

Please sign in to comment.