Merge pull request #211 from Orderella/development

Adresses Objective-C and Carthage issues
Orderella · Feb 24, 2018 · dcdfe10 · dcdfe10
2 parents d974979 + 9bae9c8
commit dcdfe10
Show file tree

Hide file tree

Showing 88 changed files with 868 additions and 1,090 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,8 @@ DerivedData
 # Bundler
 .bundle
 
-Carthage
+# Carthage
+
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+* **0.7.1** Fixes Objective-C compatability<br>Improved Carthage handling
 * **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

diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "KyoheiG3/DynamicBlurView" ~> 2.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+github "KyoheiG3/DynamicBlurView" "2.0.2"
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,14 +1,14 @@
 PODS:
-  - DynamicBlurView (2.0.0)
+  - DynamicBlurView (2.0.2)
   - 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.7.0):
+  - Nimble (7.0.3)
+  - PopupDialog (0.7.1):
     - DynamicBlurView (~> 2.0)
-  - SwiftLint (0.24.0)
+  - SwiftLint (0.25.0)
 
 DEPENDENCIES:
   - FBSnapshotTestCase (from `https://github.com/facebook/ios-snapshot-test-case.git`, commit `ed4e6a6`)
@@ -29,12 +29,12 @@ CHECKOUT OPTIONS:
     :git: https://github.com/facebook/ios-snapshot-test-case.git
 
 SPEC CHECKSUMS:
-  DynamicBlurView: 7b1bfbc1e7a0606b8a1855ff809ccaccfbda6b30
+  DynamicBlurView: aa6db4defc6e537eb86fc5e58dd3991666178399
   FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
-  Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
-  PopupDialog: b59d5a92b015dde35a1af6aacf19e960f432aef8
-  SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
+  Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
+  PopupDialog: 7b2ad0681c470eb159c33a17c4c3109debd65d5a
+  SwiftLint: e14651157288e9e01d6e1a71db7014fb5744a8ea
 
 PODFILE CHECKSUM: 7a27ac877c3a93aa83583a4625417841e72145e5
 
-COCOAPODS: 1.3.1
+COCOAPODS: 1.4.0
diff --git a/Example/Pods/DynamicBlurView/DynamicBlurView/CGImage+Accelerate.swift b/Example/Pods/DynamicBlurView/DynamicBlurView/CGImage+Accelerate.swift
diff --git a/Example/Pods/DynamicBlurView/README.md b/Example/Pods/DynamicBlurView/README.md
diff --git a/Example/Pods/Local Podspecs/PopupDialog.podspec.json b/Example/Pods/Local Podspecs/PopupDialog.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/...CwlCatchException/CwlCatchException.swift → ...CwlCatchException/CwlCatchException.swift b/...CwlCatchException/CwlCatchException.swift → ...CwlCatchException/CwlCatchException.swift
diff --git a/...CatchExceptionSupport/CwlCatchException.m → ...CatchExceptionSupport/CwlCatchException.m b/...CatchExceptionSupport/CwlCatchException.m → ...CatchExceptionSupport/CwlCatchException.m
diff --git a/...eptionSupport/include/CwlCatchException.h → ...eptionSupport/include/CwlCatchException.h b/...eptionSupport/include/CwlCatchException.h → ...eptionSupport/include/CwlCatchException.h
diff --git a/...ionHandler/CwlMachBadInstructionHandler.m → ...ionHandler/CwlMachBadInstructionHandler.m b/...ionHandler/CwlMachBadInstructionHandler.m → ...ionHandler/CwlMachBadInstructionHandler.m
diff --git a/...er/include/CwlMachBadInstructionHandler.h → ...er/include/CwlMachBadInstructionHandler.h b/...er/include/CwlMachBadInstructionHandler.h → ...er/include/CwlMachBadInstructionHandler.h
diff --git a/...achBadInstructionHandler/mach_excServer.c → ...achBadInstructionHandler/mach_excServer.c b/...achBadInstructionHandler/mach_excServer.c → ...achBadInstructionHandler/mach_excServer.c
diff --git a/...achBadInstructionHandler/mach_excServer.h → ...achBadInstructionHandler/mach_excServer.h b/...achBadInstructionHandler/mach_excServer.h → ...achBadInstructionHandler/mach_excServer.h
diff --git a/...nTesting/CwlBadInstructionException.swift → ...nTesting/CwlBadInstructionException.swift b/...nTesting/CwlBadInstructionException.swift → ...nTesting/CwlBadInstructionException.swift
diff --git a/...itionTesting/CwlCatchBadInstruction.swift → ...itionTesting/CwlCatchBadInstruction.swift b/...itionTesting/CwlCatchBadInstruction.swift → ...itionTesting/CwlCatchBadInstruction.swift
diff --git a/...nditionTesting/CwlDarwinDefinitions.swift → ...nditionTesting/CwlDarwinDefinitions.swift b/...nditionTesting/CwlDarwinDefinitions.swift → ...nditionTesting/CwlDarwinDefinitions.swift
diff --git a/...tionTesting/Mach/CwlPreconditionTesting.h → ...tionTesting/Mach/CwlPreconditionTesting.h b/...tionTesting/Mach/CwlPreconditionTesting.h → ...tionTesting/Mach/CwlPreconditionTesting.h
diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift
diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/MatcherProtocols.swift
diff --git a/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift b/Example/Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift