Merge pull request #1978 from Skyscanner/ios-15-deprecation

Update iOS deployment targets to 16.0
Skyscanner · Jun 3, 2024 · 1a701ad · 1a701ad
2 parents bb7c3cf + df0d6e8
commit 1a701ad
Show file tree

Hide file tree

Showing 27 changed files with 91 additions and 612 deletions.
diff --git a/Backpack-Common.podspec b/Backpack-Common.podspec
@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
   s.ios.resource_bundle = {
     'Icons' => 'Backpack-Common/Icons/Assets/*'
   }
-  s.ios.deployment_target = '15.1'
+  s.ios.deployment_target = '16.0'
   s.source_files = 'Backpack-Common/**/*.swift'
   s.exclude_files = 'Backpack-Common/Tests/**/*.swift'
   s.requires_arc = true

diff --git a/Backpack-Fonts/Backpack-Fonts.podspec b/Backpack-Fonts/Backpack-Fonts.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |spec|
   spec.author           = {
     'Backpack Design System' => '[email protected]'
   }
-  spec.ios.deployment_target  = '15.1'
+  spec.ios.deployment_target  = '16.0'
   spec.source = {
     git: 'https://github.com/Skyscanner/backpack-ios.git', tag: spec.version.to_s
   }

diff --git a/Backpack-SwiftUI.podspec b/Backpack-SwiftUI.podspec
@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
   s.source = {
     git: 'https://github.com/Skyscanner/backpack-ios.git', tag: s.version.to_s
   }
-  s.ios.deployment_target = '15.1'
+  s.ios.deployment_target = '16.0'
   s.source_files = 'Backpack-SwiftUI/*/Classes/**/*.swift'
 
   s.dependency 'Backpack-Common'

diff --git a/Backpack-SwiftUI/BottomSheet/Classes/BPKBottomSheet.swift b/Backpack-SwiftUI/BottomSheet/Classes/BPKBottomSheet.swift
@@ -41,47 +41,25 @@ public extension View {
         closeButtonAccessibilityLabel: String? = nil,
         title: String? = nil,
         action: BPKBottomSheetAction? = nil,
-        presentingController: UIViewController,
         @ViewBuilder bottomSheetContent: @escaping () -> BottomSheetContent
     ) -> some View {
-        if #available(iOS 16.0, *) {
-            modifier(
-                BottomSheetContainerViewModifier(
-                    isPresented: isPresented,
-                    contentMode: contentMode,
-                    header: {
-                        header(
-                            closeAction: closeAction(
-                                closeButtonAccessibilityLabel: closeButtonAccessibilityLabel,
-                                closeAction: { isPresented.wrappedValue.toggle() }
-                            ),
-                            title: title,
-                            action: action
-                        )
-                    },
-                    bottomSheetContent: bottomSheetContent
-                )
+        modifier(
+            BottomSheetContainerViewModifier(
+                isPresented: isPresented,
+                contentMode: contentMode,
+                header: {
+                    header(
+                        closeAction: closeAction(
+                            closeButtonAccessibilityLabel: closeButtonAccessibilityLabel,
+                            closeAction: { isPresented.wrappedValue.toggle() }
+                        ),
+                        title: title,
+                        action: action
+                    )
+                },
+                bottomSheetContent: bottomSheetContent
             )
-        } else {
-            modifier(
-                LegacyBottomSheetContainerViewModifier(
-                    isPresented: isPresented,
-                    contentMode: contentMode,
-                    header: {
-                        header(
-                            closeAction: closeAction(
-                                closeButtonAccessibilityLabel: closeButtonAccessibilityLabel,
-                                closeAction: { isPresented.wrappedValue.toggle() }
-                            ),
-                            title: title,
-                            action: action
-                        )
-                    },
-                    bottomSheetContent: bottomSheetContent,
-                    presentingController: presentingController
-                )
-            )
-        }
+        )
     }
 
     @ViewBuilder
@@ -91,54 +69,25 @@ public extension View {
         closeButtonAccessibilityLabel: String? = nil,
         title: String? = nil,
         action: BPKBottomSheetAction? = nil,
-        presentingController: UIViewController,
         @ViewBuilder bottomSheetContent: @escaping (Item) -> BottomSheetContent
     ) -> some View {
-        if #available(iOS 16.0, *) {
-            modifier(
-                ItemBottomSheetContainerViewModifier(
-                    item: item,
-                    contentMode: contentMode,
-                    header: {
-                        header(
-                            closeAction: closeAction(
-                                closeButtonAccessibilityLabel: closeButtonAccessibilityLabel,
-                                closeAction: { item.wrappedValue = nil }
-                            ),
-                            title: title,
-                            action: action
-                        )
-                    },
-                    bottomSheetContent: bottomSheetContent
-                )
+        modifier(
+            ItemBottomSheetContainerViewModifier(
+                item: item,
+                contentMode: contentMode,
+                header: {
+                    header(
+                        closeAction: closeAction(
+                            closeButtonAccessibilityLabel: closeButtonAccessibilityLabel,
+                            closeAction: { item.wrappedValue = nil }
+                        ),
+                        title: title,
+                        action: action
+                    )
+                },
+                bottomSheetContent: bottomSheetContent
             )
-        } else {
-            modifier(
-                LegacyBottomSheetContainerViewModifier(
-                    isPresented: Binding(
-                        get: { item.wrappedValue != nil },
-                        set: { _ in item.wrappedValue = nil }
-                    ),
-                    contentMode: contentMode,
-                    header: {
-                        header(
-                            closeAction: closeAction(
-                                closeButtonAccessibilityLabel: closeButtonAccessibilityLabel,
-                                closeAction: { item.wrappedValue = nil }
-                            ),
-                            title: title,
-                            action: action
-                        )
-                    },
-                    bottomSheetContent: {
-                        if let itemValue = item.wrappedValue {
-                            bottomSheetContent(itemValue)
-                        }
-                    },
-                    presentingController: presentingController
-                )
-            )
-        }
+        )
     }
 
     private func closeAction(
@@ -174,8 +123,7 @@ struct BPKBottomSheet_Previews: PreviewProvider {
                     contentMode: .fitContent, closeButtonAccessibilityLabel: "asd", title: "Hello",
                     action: BPKBottomSheetAction(
                         title: "Action",
-                        action: {}),
-                    presentingController: UIViewController()) {
+                        action: {})) {
                     BPKText("Bottom sheet content")
                 }
         }

diff --git a/Backpack-SwiftUI/BottomSheet/Classes/BottomSheetContainerViewModifier.swift b/Backpack-SwiftUI/BottomSheet/Classes/BottomSheetContainerViewModifier.swift
@@ -18,7 +18,6 @@
 
 import SwiftUI
 
-@available(iOS 16.0, *)
 struct BottomSheetContainerViewModifier<Header: View, BottomSheetContent: View>: ViewModifier {
     @Binding var isPresented: Bool
     @ViewBuilder let header: () -> Header
@@ -68,7 +67,6 @@ struct BottomSheetContainerViewModifier<Header: View, BottomSheetContent: View>:
     }
 }
 
-@available(iOS 16.0, *)
 extension PresentationDetent {
     static func initialDetent(for contentMode: BPKBottomSheetContentMode) -> PresentationDetent {
         switch contentMode {

diff --git a/Backpack-SwiftUI/BottomSheet/Classes/ContentFitBottomSheet.swift b/Backpack-SwiftUI/BottomSheet/Classes/ContentFitBottomSheet.swift
@@ -18,7 +18,6 @@
 
 import SwiftUI
 
-@available(iOS 16.0, *)
 struct ContentFitBottomSheet<Content: View, Header: View>: View {
     let header: () -> Header
     let bottomSheetContent: () -> Content

diff --git a/Backpack-SwiftUI/BottomSheet/Classes/ItemBottomSheetContainerViewModifier.swift b/Backpack-SwiftUI/BottomSheet/Classes/ItemBottomSheetContainerViewModifier.swift
@@ -18,7 +18,6 @@
 
 import SwiftUI
 
-@available(iOS 16.0, *)
 struct ItemBottomSheetContainerViewModifier<
     Header: View,
     BottomSheetContent: View,

diff --git a/Backpack-SwiftUI/BottomSheet/Classes/Legacy/LegacyBottomSheetContainerViewModifier.swift b/Backpack-SwiftUI/BottomSheet/Classes/Legacy/LegacyBottomSheetContainerViewModifier.swift