Drop support for iOS 13.0

Hengyu · Dec 5, 2023 · 98b366a · 98b366a
1 parent 8effeaf
commit 98b366a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 
 ## Requirements
 
-- iOS 13.0+, macCatalyst 13.0+
+- iOS 14.0+, macCatalyst 14.0+
 
 ## Installation
 

diff --git a/Sources/FeedbackSwift/FeedbackItemsDataSource.swift b/Sources/FeedbackSwift/FeedbackItemsDataSource.swift
@@ -28,14 +28,12 @@ public class FeedbackItemsDataSource {
         sections.append(
             FeedbackItemsSection(items: [TopicItem(topics), BodyItem()])
         )
-        if #available(iOS 13.0, macCatalyst 14.0, *) {
-            sections.append(
-                FeedbackItemsSection(
-                    title: localized("feedback.AdditionalInfo"),
-                    items: [AttachmentItem(isHidden: hidesAttachmentCell)]
-                )
+        sections.append(
+            FeedbackItemsSection(
+                title: localized("feedback.AdditionalInfo"),
+                items: [AttachmentItem(isHidden: hidesAttachmentCell)]
             )
-        }
+        )
         sections.append(
             FeedbackItemsSection(
                 title: localized("feedback.DeviceInfo"),

diff --git a/Sources/FeedbackSwift/FeedbackViewController.swift b/Sources/FeedbackSwift/FeedbackViewController.swift
@@ -48,11 +48,7 @@ open class FeedbackViewController: UITableViewController {
     public init(configuration: FeedbackConfiguration) {
         self.configuration = configuration
 
-        if #available(iOS 13, *) {
-            super.init(style: .insetGrouped)
-        } else {
-            super.init(style: .grouped)
-        }
+        super.init(style: .insetGrouped)
 
         wireframe = FeedbackWireframe(
             viewController: self,
@@ -139,18 +135,16 @@ extension FeedbackViewController {
             wireframe.showAttachmentActionSheet(
                 cellRect: cell.superview!.convert(cell.frame, to: view),
                 authorizePhotoLibrary: { completion in
-                    PHPhotoLibrary.requestAuthorization { status in
+                    PHPhotoLibrary.requestAuthorization(for: .readWrite) { status in
                         DispatchQueue.main.async {
                             completion(status == .authorized)
                         }
                     }
                 },
                 authorizeCamera: { completion in
-                    if #available(iOS 13.0, macCatalyst 14.0, *) {
-                        AVCaptureDevice.requestAccess(for: .video) { result in
-                            DispatchQueue.main.async {
-                                completion(result)
-                            }
+                    AVCaptureDevice.requestAccess(for: .video) { result in
+                        DispatchQueue.main.async {
+                            completion(result)
                         }
                     }
                 },

diff --git a/Sources/FeedbackSwift/FeedbackWireframe.swift b/Sources/FeedbackSwift/FeedbackWireframe.swift
@@ -6,6 +6,7 @@
 import UIKit
 import MobileCoreServices
 import MessageUI
+import UniformTypeIdentifiers
 
 protocol FeedbackWireframeProtocol {
     func showTopicsView(with service: FeedbackEditingServiceProtocol)
@@ -188,7 +189,7 @@ private extension FeedbackWireframe {
     func showImagePicker(sourceType: UIImagePickerController.SourceType) {
         let imagePicker = UIImagePickerController()
         imagePicker.sourceType = sourceType
-        imagePicker.mediaTypes = [kUTTypeImage as String, kUTTypeMovie as String]
+        imagePicker.mediaTypes = [UTType.image.identifier, UTType.movie.identifier]
         imagePicker.allowsEditing = false
         imagePicker.delegate = imagePickerDelegate
         imagePicker.modalPresentationStyle = .formSheet

diff --git a/Sources/FeedbackSwift/Functions.swift b/Sources/FeedbackSwift/Functions.swift
@@ -3,9 +3,10 @@
 // Copyright (c) 2017 CAPH TECH. All rights reserved.
 //
 
-import UIKit
-import MobileCoreServices
 import AVFoundation
+import MobileCoreServices
+import UIKit
+import UniformTypeIdentifiers
 
 func localized(_ key: String) -> String {
     #if SWIFT_PACKAGE && swift(>=5.3)