Fix regressions from PR #149

jevonmao · Feb 26, 2024 · 94b6eaf · 94b6eaf
1 parent bd4ef03
commit 94b6eaf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/Package.swift b/Package.swift
@@ -22,11 +22,8 @@ let permissionsTargets: [Target] = [
     ),
     .target(
         name: "PermissionsSwiftUICalendar",
-        dependencies: ["Introspect", "CorePermissionsSwiftUI"],
-        exclude: ["../../Tests/PermissionsSwiftUITests/__Snapshots__"],
-        swiftSettings: [
-            .define("PERMISSIONSWIFTUI_EVENT")
-        ]
+        dependencies: ["Introspect", "CorePermissionsSwiftUI", "PermissionsSwiftUIEvent"],
+        exclude: ["../../Tests/PermissionsSwiftUITests/__Snapshots__"]
     ),
     .target(
         name: "PermissionsSwiftUICamera",
@@ -95,11 +92,8 @@ let permissionsTargets: [Target] = [
     ),
     .target(
         name: "PermissionsSwiftUIReminder",
-        dependencies: ["Introspect", "CorePermissionsSwiftUI"],
-        exclude: ["../../Tests/PermissionsSwiftUITests/__Snapshots__"],
-        swiftSettings: [
-            .define("PERMISSIONSWIFTUI_EVENT")
-        ]
+        dependencies: ["Introspect", "CorePermissionsSwiftUI", "PermissionsSwiftUIEvent"],
+        exclude: ["../../Tests/PermissionsSwiftUITests/__Snapshots__"]
     ),
     .target(
         name: "PermissionsSwiftUISpeech",
@@ -120,6 +114,11 @@ let permissionsTargets: [Target] = [
         name: "PermissionsSwiftUIBiometrics",
         dependencies: ["Introspect", .target(name: "CorePermissionsSwiftUI")],
         exclude: ["../../Tsts/PermissionsSwiftUITests/__Snapshots__"]
+    ),
+    .target(
+        name: "PermissionsSwiftUIEvent",
+        dependencies: ["Introspect", .target(name: "CorePermissionsSwiftUI")],
+        exclude: ["../../Tsts/PermissionsSwiftUITests/__Snapshots__"]
     )]
 
 let package = Package(
@@ -148,4 +147,4 @@ let package = Package(
         ),
 
     ] + permissionsTargets
-)
+)
diff --git a/Sources/PermissionsSwiftUICalendar/JMCalendarPermissionManager.swift b/Sources/PermissionsSwiftUICalendar/JMCalendarPermissionManager.swift
@@ -6,7 +6,9 @@
 //
 
 import Foundation
-#if !os(tvOS) && PERMISSIONSWIFTUI_EVENT
+import PermissionsSwiftUIEvent
+
+#if !os(tvOS)
 import EventKit
 import CorePermissionsSwiftUI
 

diff --git a/...sionManagers/EventPermissionManager.swift → ...SwiftUIEvent/EventPermissionManager.swift b/...sionManagers/EventPermissionManager.swift → ...SwiftUIEvent/EventPermissionManager.swift
@@ -6,8 +6,9 @@
 //
 
 import Foundation
+import CorePermissionsSwiftUI
 
-#if !os(tvOS) && PERMISSIONSWIFTUI_EVENT
+#if !os(tvOS)
 import EventKit
 
 open class EventPermissionManager: PermissionManager {
@@ -54,4 +55,4 @@ open class EventPermissionManager: PermissionManager {
     }
 
 }
-#endif
+#endif
diff --git a/Sources/PermissionsSwiftUIReminder/JMRemindersPermissionManager.swift b/Sources/PermissionsSwiftUIReminder/JMRemindersPermissionManager.swift
@@ -6,7 +6,9 @@
 //
 
 import Foundation
-#if !os(tvOS) && PERMISSIONSWIFTUI_EVENT
+import PermissionsSwiftUIEvent
+
+#if !os(tvOS)
 import EventKit
 import CorePermissionsSwiftUI