Merge branch 'Swift4.2'

BergerBytes · Dec 11, 2018 · 5db1976 · 5db1976
2 parents 5033fe2 + 9021876
commit 5db1976
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/BBSlideoutMenu.podspec b/BBSlideoutMenu.podspec
@@ -24,11 +24,6 @@ Pod::Spec.new do |s|
   s.platform     = :ios, '9.0'
   s.requires_arc = true
   s.source_files = 'Pod/Classes/'
-  s.resource_bundles = {
-    'BBSlideoutMenu' => ['Pod/Assets/*.png']
-  }
+  s.swift_version = '4.2'
 
-  # s.public_header_files = 'Pod/Classes/**/*.h'
-  # s.frameworks = 'UIKit', 'MapKit'
-  # s.dependency 'AFNetworking', '~> 2.3'
-end
+end
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pod/Classes/BBSlideoutMenu.swift b/Pod/Classes/BBSlideoutMenu.swift
@@ -269,7 +269,7 @@ open class BBSlideoutMenu: UIView {
             delay: 0.0,
             usingSpringWithDamping: 1,
             initialSpringVelocity: 0.0,
-            options: UIViewAnimationOptions(),
+            options: UIView.AnimationOptions(),
 
             animations: { () -> Void in
                 self.keyWindow.layoutIfNeeded()
@@ -343,11 +343,11 @@ open class BBSlideoutMenu: UIView {
         }
     }
 
-    func tapHandle(_ tap: UITapGestureRecognizer) {
+    @objc func tapHandle(_ tap: UITapGestureRecognizer) {
         dismissSlideMenu(true, time: nil)
     }
 
-    func panHandle(_ pan: UIPanGestureRecognizer) {
+    @objc func panHandle(_ pan: UIPanGestureRecognizer) {
         if keyWindow == nil {
             keyWindow = UIApplication.shared.keyWindow!
         }
@@ -391,7 +391,7 @@ open class BBSlideoutMenu: UIView {
         }
     }
 
-    func edgeHandle(_ edge: UIScreenEdgePanGestureRecognizer) {
+    @objc func edgeHandle(_ edge: UIScreenEdgePanGestureRecognizer) {
         if keyWindow == nil {
             keyWindow = UIApplication.shared.keyWindow!
         }