Version 2.4.1

Co-authored-by: CodingIran <codingiran@163.com>

.github/workflows/ci.yml

@@ -10,6 +10,19 @@ on:
 
 jobs:
   build:
+    runs-on: macOS-11
+    steps:
+    - uses: actions/checkout@v1
+    - name: "Swift 5.4"
+      run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.4 clean build
+      env:
+        DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
+    - name: "Swift 5.5"
+      run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.5 clean build
+      env:
+        DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
+
+  build_compat:
     runs-on: macOS-10.15
     steps:
     - uses: actions/checkout@v1
@@ -24,9 +37,22 @@ jobs:
     - name: "Swift 5.3"
       run: xcodebuild -scheme FloatingPanel SWIFT_VERSION=5.3 clean build
       env:
-        DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
 
   testing:
+    runs-on: macOS-11
+    steps:
+    - uses: actions/checkout@v1
+    - name: "Testing in iOS 14.5"
+      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 12 Pro'
+      env:
+        DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
+    - name: "Testing in iOS 15.0"
+      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=15.0,name=iPhone 13 Pro'
+      env:
+        DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
+
+  testing_compat:
     runs-on: macOS-10.15
     steps:
     - uses: actions/checkout@v1
@@ -34,15 +60,15 @@ jobs:
       run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=13.7,name=iPhone 11 Pro'
       env:
         DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
-    - name: "Testing in iOS 14.3"
-      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=14.3,name=iPhone 12 Pro'
+    - name: "Testing in iOS 14.4"
+      run: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=14.4,name=iPhone 12 Pro'
       env:
-        DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
 
   example:
-    runs-on: macOS-10.15
+    runs-on: macOS-11
     env:
-      DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: "Build Maps"
@@ -53,26 +79,23 @@ jobs:
       run: xcodebuild -workspace FloatingPanel.xcworkspace -scheme Samples -sdk iphonesimulator clean build
 
   swiftpm:
-    runs-on: macOS-10.15
+    runs-on: macOS-11
     env:
-      DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
     steps:
     - uses: actions/checkout@v1
     - name: "Swift Package build"
       run: swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios14.3-simulator"
 
   carthage:
-    runs-on: macOS-10.15
-    env:
-      # Carthage doesn't fix issues on Xcode 12: https://github.com/Carthage/Carthage/releases/tag/0.36.0
-      DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
+    runs-on: macOS-11
     steps:
     - uses: actions/checkout@v1
     - name: "Carthage build"
-      run: carthage build --no-skip-current
+      run: carthage build --use-xcframeworks --no-skip-current
 
   cocoapods:
-    runs-on: macOS-10.15
+    runs-on: macOS-11
     steps:
     - uses: actions/checkout@v1
     - name: "CocoaPods: pod lib lint"

.travis.yml

@@ -1,20 +0,0 @@
-language: objective-c
-branches:
-  only:
-    - master
-env:
-  global:
-  - LANG=en_US.UTF-8
-  - LC_ALL=en_US.UTF-8
-jobs:
-  include:
-  - stage: "Tests"
-    script: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=10.3.1,name=iPhone SE (1st generation)'
-    osx_image: xcode11.6
-    name: "iPhone SE (iOS 10.3)"
-  - script: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=11.4,name=iPhone 7'
-    osx_image: xcode11.6
-    name: "iPhone 7 (iOS 11.4)"
-  - script: xcodebuild clean test -scheme FloatingPanel -workspace FloatingPanel.xcworkspace -destination 'platform=iOS Simulator,OS=12.4,name=iPhone X'
-    osx_image: xcode11.6
-    name: "iPhone X (iOS 12.4)"

Examples/SamplesObjC/SamplesObjC/ViewController.m

@@ -36,7 +36,7 @@ static FloatingPanelState *_lastQuart;
     [fpc setBehavior:[MyFloatingPanelBehavior new]];
     [fpc setRemovalInteractionEnabled:NO];
 
-    [fpc addPanelToParent:self at:self.view.subviews.count  animated:NO];
+    [fpc addPanelToParent:self at:self.view.subviews.count animated:NO completion:nil];
     [fpc moveToState:FloatingPanelState.Tip animated:true completion:nil];
 
     [self updateAppearance: fpc];

FloatingPanel.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name                = "FloatingPanel"
-  s.version             = "2.4.0"
+  s.version             = "2.4.1"
   s.summary             = "FloatingPanel is a clean and easy-to-use UI component of a floating panel interface."
   s.description         = <<-DESC
 FloatingPanel is a clean and easy-to-use UI component for a new interface introduced in Apple Maps, Shortcuts and Stocks app.

Sources/BackdropView.swift

@@ -7,5 +7,5 @@ import UIKit
 public class BackdropView: UIView {
 
     /// The gesture recognizer for tap gestures to dismiss a panel.
-    public var dismissalTapGestureRecognizer: UITapGestureRecognizer!
+    @objc public var dismissalTapGestureRecognizer: UITapGestureRecognizer!
 }

Sources/Core.swift

@@ -837,6 +837,7 @@ class Core: NSObject, UIGestureRecognizerDelegate {
     }
 
     private func tearDownActiveInteraction() {
+        guard panGestureRecognizer.isEnabled else { return }
         // Cancel the pan gesture so that panningEnd(with:velocity:) is called
         panGestureRecognizer.isEnabled = false
         panGestureRecognizer.isEnabled = true

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.4.0</string>
+	<string>2.4.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

Tests/CoreTests.swift

@@ -766,6 +766,13 @@ class CoreTests: XCTestCase {
             (#line, tipPos, CGPoint(x: 0.0, y: 1000.0), .hidden),
             ])
     }
+
+    func test_keep_pan_gesture_disabled() {
+        let fpc = FloatingPanelController()
+        fpc.panGestureRecognizer.isEnabled = false
+        fpc.showForTest()
+        XCTAssertFalse(fpc.panGestureRecognizer.isEnabled)
+    }
 }
 
 private class FloatingPanelLayout3Positions: FloatingPanelTestLayout {