add RKSwiftUIBridge target

StanfordBDHG · Nov 18, 2024 · 1993555 · 1993555
1 parent 771a074
commit 1993555
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 13 deletions.
diff --git a/Package.swift b/Package.swift
@@ -15,14 +15,15 @@ let package = Package(
     name: "ResearchKit",
     defaultLocalization: "en",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v18),
         .visionOS(.v1)
     ],
     products: [
         .library(name: "ResearchKit", targets: ["ResearchKit"]),
         .library(name: "ResearchKitUI", targets: ["ResearchKitUI"]),
         .library(name: "ResearchKitActiveTask", targets: ["ResearchKitActiveTask"]),
-        .library(name: "ResearchKitSwiftUI", targets: ["ResearchKitSwiftUI"])
+        .library(name: "ResearchKitSwiftUI", targets: ["ResearchKitSwiftUI"]),
+        .library(name: "ResearchKitSwiftUIBridge", targets: ["ResearchKitSwiftUIBridge"])
     ],
     dependencies: [] + swiftLintPackage(),
     targets: [
@@ -41,14 +42,21 @@ let package = Package(
         .target(
             name: "ResearchKitSwiftUI",
             dependencies: [
-                .target(name: "ResearchKit"),
-                .target(name: "ResearchKitUI"),
-                .target(name: "ResearchKitActiveTask", condition: .when(platforms: [.iOS]))
+                .target(name: "ResearchKit")
             ],
-            swiftSettings: [
-                swiftConcurrency
-            ],
-            plugins: [] + swiftLintPlugin()
+            path: "ResearchKitSwiftUI"
+        ),
+        .target(
+             name: "ResearchKitSwiftUIBridge",
+             dependencies: [
+                 .target(name: "ResearchKit"),
+                 .target(name: "ResearchKitUI"),
+                 .target(name: "ResearchKitActiveTask", condition: .when(platforms: [.iOS]))
+             ],
+             swiftSettings: [
+                 swiftConcurrency
+             ],
+             plugins: [] + swiftLintPlugin()
         )
     ]
 )

diff --git a/...s/ResearchKitSwiftUI/CancelBehavior.swift → ...archKitSwiftUIBridge/CancelBehavior.swift b/...s/ResearchKitSwiftUI/CancelBehavior.swift → ...archKitSwiftUIBridge/CancelBehavior.swift
diff --git a/Sources/ResearchKitSwiftUI/Export.swift → ...ces/ResearchKitSwiftUIBridge/Export.swift b/Sources/ResearchKitSwiftUI/Export.swift → ...ces/ResearchKitSwiftUIBridge/Export.swift
diff --git a/...ces/ResearchKitSwiftUI/ORKLifecycle.swift → ...searchKitSwiftUIBridge/ORKLifecycle.swift b/...ces/ResearchKitSwiftUI/ORKLifecycle.swift → ...searchKitSwiftUIBridge/ORKLifecycle.swift
diff --git a/...searchKitSwiftUI/ORKOrderedTaskView.swift → ...KitSwiftUIBridge/ORKOrderedTaskView.swift b/...searchKitSwiftUI/ORKOrderedTaskView.swift → ...KitSwiftUIBridge/ORKOrderedTaskView.swift
@@ -22,7 +22,7 @@ import SwiftUI
 ///
 /// ```swift
 /// import ResearchKit
-/// import ResearchKitSwiftUI
+/// import ResearchKitSwiftUIBridge
 ///
 ///
 /// struct TrailMakingTask: View {

diff --git a/...archKitSwiftUI.docc/ResearchKitSwiftUI.md → ...UIBridge.docc/ResearchKitSwiftUIBridge.md b/...archKitSwiftUI.docc/ResearchKitSwiftUI.md → ...UIBridge.docc/ResearchKitSwiftUIBridge.md
@@ -1,4 +1,4 @@
-# ``ResearchKitSwiftUI``
+# ``ResearchKitSwiftUIBridge``
 
 Additional support when using ResearchKit with SwiftUI.
 

diff --git a/Sources/ResearchKitSwiftUI/TaskResult.swift → ...ResearchKitSwiftUIBridge/TaskResult.swift b/Sources/ResearchKitSwiftUI/TaskResult.swift → ...ResearchKitSwiftUIBridge/TaskResult.swift
diff --git a/Tests/UITests/TestApp/ORKOrderedTaskViewTests.swift b/Tests/UITests/TestApp/ORKOrderedTaskViewTests.swift
@@ -7,7 +7,7 @@
 //
 
 import ResearchKit
-import ResearchKitSwiftUI
+import ResearchKitSwiftUIBridge
 import SwiftUI
 
 

diff --git a/Tests/UITests/TestApp/TestApp.swift b/Tests/UITests/TestApp/TestApp.swift
@@ -7,7 +7,7 @@
 //
 
 import ResearchKit
-import ResearchKitSwiftUI
+import ResearchKitSwiftUIBridge
 import SwiftUI