Merge branch 'sparrowcode:main' into main

Author: jonasrichardrichter

Package.swift

@@ -1,14 +1,15 @@
-// swift-tools-version:5.3
+// swift-tools-version: 5.9
 
 import PackageDescription
 
 let package = Package(
     name: "PermissionsKit",
     defaultLocalization: "en",
     platforms: [
-        .iOS(.v11),
-        .tvOS(.v11),
-        .watchOS(.v3)
+        .iOS(.v12),
+        .tvOS(.v12),
+        .watchOS(.v4),
+        .macOS(.v13)
     ],
     products: [
         .library(

PermissionsKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name = "PermissionsKit"
-  s.version = "10.0.1"
+  s.version = "11.0.0"
   s.summary = "Ask permissions with ready-use interface. You can check status permission and if it has been requested before. Support SwiftUI."
   s.homepage = "https://github.com/sparrowcode/PermissionsKit"
   s.source = { :git => "https://github.com/sparrowcode/PermissionsKit.git", :tag => s.version }

README.md

@@ -69,7 +69,7 @@ Universal API for request permission and get its statuses — available `.author
 
 ## Installation
 
-Ready to use on iOS 11+. Supports iOS, tvOS. Working with `UIKit` and `SwiftUI`.
+Ready to use on iOS 12+. Supports iOS, macOS, visionOS, tvOS & watchOS. Working with `UIKit` and `SwiftUI`.
 
 ### Swift Package Manager
 
@@ -84,7 +84,7 @@ Or adding it to the `dependencies` of your `Package.swift`:
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/sparrowcode/PermissionsKit", .upToNextMajor(from: "10.0.1"))
+    .package(url: "https://github.com/sparrowcode/PermissionsKit", .upToNextMajor(from: "11.0.0"))
 ]
 ```
 
@@ -113,8 +113,7 @@ pod 'PermissionsKit/NotificationPermission', :git => 'https://github.com/sparrow
 pod 'PermissionsKit/MicrophonePermission', :git => 'https://github.com/sparrowcode/PermissionsKit'
 pod 'PermissionsKit/RemindersPermission', :git => 'https://github.com/sparrowcode/PermissionsKit'
 pod 'PermissionsKit/SpeechRecognizerPermission', :git => 'https://github.com/sparrowcode/PermissionsKit'
-pod 'PermissionsKit/LocationWhenInUsePermission', :git => 'https://github.com/sparrowcode/PermissionsKit'
-pod 'PermissionsKit/LocationAlwaysPermission', :git => 'https://github.com/sparrowcode/PermissionsKit'
+pod 'PermissionsKit/LocationPermission', :git => 'https://github.com/sparrowcode/PermissionsKit'
 pod 'PermissionsKit/MotionPermission', :git => 'https://github.com/sparrowcode/PermissionsKit'
 pod 'PermissionsKit/MediaLibraryPermission', :git => 'https://github.com/sparrowcode/PermissionsKit'
 pod 'PermissionsKit/BluetoothPermission', :git => 'https://github.com/sparrowcode/PermissionsKit'
@@ -127,7 +126,7 @@ pod 'PermissionsKit/HealthPermission', :git => 'https://github.com/sparrowcode/P
 
 ## Why Modules
 
-If put all code to one package and compile it, Apple Review Team will see a lot of calls to permissions API and ask you provide reason why you really need it permissions. Modules allow compile only really using code parts. Just select only which you need.
+If you put all your code into one package and compile it, the Apple Review Team will see a lot of calls to the permissions API. Most likely, they will ask you to provide a valid reason for why you really need those permissions. Using modules allows you to compile only the parts of the code that are actually in use. Just select only what you need.
 
 > [!WARNING]
 > Import only the permissions you really need.

Sources/BluetoothPermission/BluetoothHandler.swift

@@ -49,7 +49,16 @@ class BluetoothHandler: NSObject, CBCentralManagerDelegate {
 
     func centralManagerDidUpdateState(_ central: CBCentralManager) {
         if #available(iOS 13.0, tvOS 13, *) {
-            switch central.authorization {
+            
+            let authorization: CBManagerAuthorization = {
+                #if os(visionOS)
+                return CBManager.authorization
+                #else
+                return central.authorization
+                #endif
+            }()
+            
+            switch authorization {
             case .notDetermined:
                 break
             default:

Sources/ContactsPermission/ContactsPermission.swift

@@ -40,7 +40,11 @@ public class ContactsPermission: Permission {
     open var usageDescriptionKey: String? { "NSContactsUsageDescription" }
 
     public override var status: Permission.Status {
-        switch CNContactStore.authorizationStatus(for: .contacts) {
+        let authorizationStatus = CNContactStore.authorizationStatus(for: .contacts)
+        if #available(iOS 18.0, *), authorizationStatus == .limited {
+            return .authorized
+        }
+        switch authorizationStatus {
         case .authorized: return .authorized
         case .denied: return .denied
         case .notDetermined: return .notDetermined

Sources/LocationPermission/Handlers/LocationWhenInUseHandler.swift

@@ -33,14 +33,17 @@ class LocationWhenInUseHandler: NSObject, CLLocationManagerDelegate {
 
     lazy var locationManager = CLLocationManager()
 
+    #if !os(visionOS)
     func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
         if status == .notDetermined {
             return
         }
         completionHandler()
     }
+    #endif
+    
 
-    @available(iOS 14.0, *)
+    @available(iOS 14.0, macOS 11.0, watchOS 7.0, tvOS 14.0, visionOS 1.0, *)
     func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
         if manager.authorizationStatus == .notDetermined {
             return
@@ -55,7 +58,16 @@ class LocationWhenInUseHandler: NSObject, CLLocationManagerDelegate {
     func requestPermission(_ completionHandler: @escaping () -> Void) {
         self.completionHandler = completionHandler
 
-        let status = CLLocationManager.authorizationStatus()
+        let status: CLAuthorizationStatus = {
+            #if os(visionOS)
+            locationManager.authorizationStatus
+            #elseif os(macOS)
+            locationManager.authorizationStatus
+            #else
+            CLLocationManager.authorizationStatus()
+            #endif
+        }()
+        
         switch status {
         case .notDetermined:
             locationManager.delegate = self

Sources/PermissionsKit/Data/Text.swift

@@ -19,7 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import UIKit
+import Foundation
 
 enum Texts {
 

Sources/PermissionsKit/Permission.swift

@@ -19,7 +19,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+import Foundation
+
+#if os(iOS)
 import UIKit
+#endif
 
 open class Permission {
 
@@ -48,6 +52,7 @@ open class Permission {
      For most permissions its app page in settings app.
      You can overide it if your permission need open custom page.
      */
+    #if os(iOS)
     @available(iOSApplicationExtension, unavailable)
     open func openSettingPage() {
         DispatchQueue.main.async {
@@ -57,6 +62,7 @@ open class Permission {
             }
         }
     }
+    #endif
 
     // MARK: Must Ovveride