Skip to content

Commit dcdfe10

Browse files
mwfiremwfire
authored
Merge pull request #211 from Orderella/development
Adresses Objective-C and Carthage issues
2 parents d974979 + 9bae9c8 commit dcdfe10

File tree

88 files changed

+868
-1090
lines changed

Some content is hidden

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

88 files changed

+868
-1090
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ DerivedData
2222
# Bundler
2323
.bundle
2424

25-
Carthage
25+
# Carthage
26+
2627
# We recommend against adding the Pods directory to your .gitignore. However
2728
# you should judge for yourself, the pros and cons are mentioned at:
2829
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control

‎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.7.1** Fixes Objective-C compatability<br>Improved Carthage handling
34
* **0.7.0** Removed FXBlurView while switching to DynamicBlurView
45
* **0.6.2** Added preferredWidth option for iPads
56
* **0.6.1** Added shake animation<br>Introduced hideStatusBar option

‎Cartfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "KyoheiG3/DynamicBlurView" ~> 2.0

‎Cartfile.resolved‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "KyoheiG3/DynamicBlurView" "2.0.2"

‎Example/Podfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
PODS:
2-
- DynamicBlurView (2.0.0)
2+
- DynamicBlurView (2.0.2)
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.2)
9-
- PopupDialog (0.7.0):
8+
- Nimble (7.0.3)
9+
- PopupDialog (0.7.1):
1010
- DynamicBlurView (~> 2.0)
11-
- SwiftLint (0.24.0)
11+
- SwiftLint (0.25.0)
1212

1313
DEPENDENCIES:
1414
- FBSnapshotTestCase (from `https://github.com/facebook/ios-snapshot-test-case.git`, commit `ed4e6a6`)
@@ -29,12 +29,12 @@ CHECKOUT OPTIONS:
2929
:git: https://github.com/facebook/ios-snapshot-test-case.git
3030

3131
SPEC CHECKSUMS:
32-
DynamicBlurView: 7b1bfbc1e7a0606b8a1855ff809ccaccfbda6b30
32+
DynamicBlurView: aa6db4defc6e537eb86fc5e58dd3991666178399
3333
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
34-
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
35-
PopupDialog: b59d5a92b015dde35a1af6aacf19e960f432aef8
36-
SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
34+
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
35+
PopupDialog: 7b2ad0681c470eb159c33a17c4c3109debd65d5a
36+
SwiftLint: e14651157288e9e01d6e1a71db7014fb5744a8ea
3737

3838
PODFILE CHECKSUM: 7a27ac877c3a93aa83583a4625417841e72145e5
3939

40-
COCOAPODS: 1.3.1
40+
COCOAPODS: 1.4.0

‎Example/Pods/DynamicBlurView/DynamicBlurView/CGImage+Accelerate.swift‎

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/DynamicBlurView/README.md‎

Lines changed: 1 addition & 3 deletions
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‎

Lines changed: 3 additions & 3 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: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Nimble/Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.swift renamed to Example/Pods/Nimble/Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift

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

0 commit comments

Comments
 (0)