Skip to content

Commit b0bd3b4

Browse files
authored
Merge pull request #270 from Orderella/Swift4.2
Swift4.2
2 parents cbaddf4 + 3cdaf46 commit b0bd3b4

File tree

77 files changed

+1132
-1166
lines changed

Some content is hidden

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

77 files changed

+1132
-1166
lines changed

.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.2

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
language: objective-c
2-
osx_image: xcode9.1
2+
osx_image: xcode10
33
env:
44
global:
55
- WORKSPACE=Example/PopupDialog.xcworkspace
66
- IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
7-
- IOS_SDK=iphonesimulator11.1
7+
- IOS_SDK=iphonesimulator12.0
88
- EXAMPLE_SCHEME="PopupDialog-Example"
99
matrix:
1010
- 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"

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changelog
22

3+
* **0.9.0** Swift 4.2 support
34
* **0.8.1** Added shadow appearance properties
45
* **0.8.0** Separated tap and pan gesture dismissal
56
* **0.7.1** Fixes Objective-C compatability<br>Improved Carthage handling
@@ -9,7 +10,7 @@
910
* **0.6.0** Swift 4 support<br>Dropped iOS8 compatibility
1011
* **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
1112
* **0.5.3** Fixed memory leak with custom view controllers<br>Added UI automation & snapshot tests
12-
* **0.5.2** Fixed image scaling for default view
13+
* **0.5.2** Fixed image scaling for default view
1314
* **0.5.1** Introduced custom button height parameter<br>Reintroduced iOS8 compatibility
1415
* **0.5.0** Swift 3 compatibility / removed iOS8
1516
* **0.4.0** iOS 8 compatibility

Cartfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "KyoheiG3/DynamicBlurView" ~> 2.0
1+
github "KyoheiG3/DynamicBlurView" ~> 3.0

Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "KyoheiG3/DynamicBlurView" "2.0.2"
1+
github "KyoheiG3/DynamicBlurView" "3.0.1"

Example/Podfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
platform :ios, '9.0'
22
use_frameworks!
33

4+
ENV['COCOAPODS_DISABLE_STATS'] = "true" ## This disabled the Sending Stats when running Pod install in terminal
5+
46
target 'PopupDialog_Example' do
57

68
pod 'PopupDialog', :path => '../'
@@ -9,8 +11,8 @@ target 'PopupDialog_Example' do
911
target 'PopupDialog_Tests' do
1012
inherit! :search_paths
1113

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

1517
end
1618
end

Example/Podfile.lock

+11-18
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,39 @@
11
PODS:
2-
- DynamicBlurView (2.0.2)
2+
- DynamicBlurView (3.0.1)
33
- FBSnapshotTestCase (2.1.4):
44
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
55
- FBSnapshotTestCase/Core (2.1.4)
66
- FBSnapshotTestCase/SwiftSupport (2.1.4):
77
- FBSnapshotTestCase/Core
8-
- Nimble (7.0.3)
9-
- PopupDialog (0.8.1):
10-
- DynamicBlurView (~> 2.0)
8+
- Nimble (7.3.1)
9+
- PopupDialog (0.9.0):
10+
- DynamicBlurView (~> 3.0.1)
1111
- SwiftLint (0.27.0)
1212

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

1919
SPEC REPOS:
2020
https://github.com/cocoapods/specs.git:
2121
- DynamicBlurView
22+
- FBSnapshotTestCase
2223
- Nimble
2324
- SwiftLint
2425

2526
EXTERNAL SOURCES:
26-
FBSnapshotTestCase:
27-
:commit: ed4e6a6
28-
:git: https://github.com/facebook/ios-snapshot-test-case.git
2927
PopupDialog:
3028
:path: "../"
3129

32-
CHECKOUT OPTIONS:
33-
FBSnapshotTestCase:
34-
:commit: ed4e6a6
35-
:git: https://github.com/facebook/ios-snapshot-test-case.git
36-
3730
SPEC CHECKSUMS:
38-
DynamicBlurView: aa6db4defc6e537eb86fc5e58dd3991666178399
31+
DynamicBlurView: b1df5415f9bd31897549e5d7077e5ec120a4d636
3932
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
40-
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
41-
PopupDialog: 8d69f3c44b2ebde5a45fe64546bf4ee0d574d763
33+
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
34+
PopupDialog: d0eb441a6a0a84b054456ddf6ecc3fd3d2a6f332
4235
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
4336

44-
PODFILE CHECKSUM: 7a27ac877c3a93aa83583a4625417841e72145e5
37+
PODFILE CHECKSUM: 2d0166d1e20a1e39377fb316142d39a3785d58f2
4538

4639
COCOAPODS: 1.5.3

Example/Pods/DynamicBlurView/DynamicBlurView/DynamicBlurView.swift

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/DynamicBlurView/DynamicBlurView/TrackingMode.swift

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/DynamicBlurView/README.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

+11-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Nimble/Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)