From 4fd1b7816f9f0125cf5243946f45a35af2ed956e Mon Sep 17 00:00:00 2001 From: Darren Spriet Date: Wed, 6 Sep 2023 10:02:53 -0400 Subject: [PATCH 1/3] Update to remove unsupported available with older properties and removed warnings --- FittedSheets.podspec.json | 4 ++-- FittedSheets.xcodeproj/project.pbxproj | 4 ++-- FittedSheets/Compatible.swift | 8 ++++---- FittedSheets/SheetOptions.swift | 18 ------------------ 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/FittedSheets.podspec.json b/FittedSheets.podspec.json index 5c48ff9..36a36fb 100644 --- a/FittedSheets.podspec.json +++ b/FittedSheets.podspec.json @@ -1,6 +1,6 @@ { "name": "FittedSheets", - "version": "2.5.3", + "version": "2.5.4", "summary": "A bottom sheets implementation for iOS apps.", "description": "iOS doesn't have a good way to use bottom sheets natively, so this is to bridge the gap with a decent looking implementation.", "homepage": "https://github.com/gordontucker/FittedSheets", @@ -10,7 +10,7 @@ }, "source": { "git": "https://github.com/gordontucker/FittedSheets.git", - "tag": "2.5.3" + "tag": "2.5.4" }, "platforms": { "ios": "10.0" diff --git a/FittedSheets.xcodeproj/project.pbxproj b/FittedSheets.xcodeproj/project.pbxproj index 5d67440..990cde1 100644 --- a/FittedSheets.xcodeproj/project.pbxproj +++ b/FittedSheets.xcodeproj/project.pbxproj @@ -723,7 +723,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = FittedSheets/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -754,7 +754,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = FittedSheets/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/FittedSheets/Compatible.swift b/FittedSheets/Compatible.swift index 9820e3f..3cc809c 100644 --- a/FittedSheets/Compatible.swift +++ b/FittedSheets/Compatible.swift @@ -1,6 +1,6 @@ // // File.swift -// +// // // Created by Nhuan Vu on 8/25/21. // @@ -9,7 +9,7 @@ import UIKit extension UIView { - open var compatibleSafeAreaInsets: UIEdgeInsets { + public var compatibleSafeAreaInsets: UIEdgeInsets { if #available(iOS 11.0, *) { return self.safeAreaInsets } else { @@ -19,7 +19,7 @@ extension UIView { } extension CALayer { - open var compatibleMaskedCorners: CACornerMask { + public var compatibleMaskedCorners: CACornerMask { get { if #available(iOS 11.0, *) { return self.maskedCorners @@ -36,7 +36,7 @@ extension CALayer { } extension UIViewController { - open var compatibleAdditionalSafeAreaInsets: UIEdgeInsets { + public var compatibleAdditionalSafeAreaInsets: UIEdgeInsets { get { if #available(iOS 11.0, *) { return self.additionalSafeAreaInsets diff --git a/FittedSheets/SheetOptions.swift b/FittedSheets/SheetOptions.swift index 1650b3e..fc4382c 100644 --- a/FittedSheets/SheetOptions.swift +++ b/FittedSheets/SheetOptions.swift @@ -43,24 +43,6 @@ public struct SheetOptions { public var horizontalPadding: CGFloat = 0 public var maxWidth: CGFloat? - - /* These properties will be removed in an upcoming release, leaving them for now so people can transition slowly */ - - @available(*, unavailable, message: "minimumSpaceAbovePullBar is now a property on SheetViewController") - public var minimumSpaceAbovePullBar: CGFloat = 0 - - @available(*, unavailable, message: "gripSize is now a property on SheetViewController") - public var gripSize: CGSize = .zero - - @available(*, unavailable, message: "gripColor is now a property on SheetViewController") - public var gripColor: UIColor = .white - - @available(*, unavailable, message: "pullBarBackgroundColor is now a property on SheetViewController") - public var pullBarBackgroundColor: UIColor = UIColor.clear - - @available(*, unavailable, message: "cornerRadius is now a property on SheetViewController") - public var cornerRadius: CGFloat = 0 - public var isRubberBandEnabled: Bool = false /// Experimental flag that attempts to shrink the nested presentations more each time a new sheet is presented. This must be set before any sheet is presented. From 92e6501b00ebf511e1a1ecf3093ece5445c97cc8 Mon Sep 17 00:00:00 2001 From: Darren Spriet Date: Wed, 6 Sep 2023 10:16:32 -0400 Subject: [PATCH 2/3] Put minimum back to 11 --- FittedSheets.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FittedSheets.xcodeproj/project.pbxproj b/FittedSheets.xcodeproj/project.pbxproj index 990cde1..5d67440 100644 --- a/FittedSheets.xcodeproj/project.pbxproj +++ b/FittedSheets.xcodeproj/project.pbxproj @@ -723,7 +723,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = FittedSheets/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -754,7 +754,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = FittedSheets/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", From 9cd24d20d2ca3091359e2a7c8396d096a7bca5c8 Mon Sep 17 00:00:00 2001 From: Darren Spriet Date: Wed, 6 Sep 2023 13:20:51 -0400 Subject: [PATCH 3/3] Bump podspec --- FittedSheets.podspec.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FittedSheets.podspec.json b/FittedSheets.podspec.json index 36a36fb..4a2250a 100644 --- a/FittedSheets.podspec.json +++ b/FittedSheets.podspec.json @@ -1,6 +1,6 @@ { "name": "FittedSheets", - "version": "2.5.4", + "version": "2.6.0", "summary": "A bottom sheets implementation for iOS apps.", "description": "iOS doesn't have a good way to use bottom sheets natively, so this is to bridge the gap with a decent looking implementation.", "homepage": "https://github.com/gordontucker/FittedSheets", @@ -10,7 +10,7 @@ }, "source": { "git": "https://github.com/gordontucker/FittedSheets.git", - "tag": "2.5.4" + "tag": "2.6.0" }, "platforms": { "ios": "10.0"