Fix UITest & update package dependencies

Author: phnagy

Package.swift

@@ -27,10 +27,10 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/FHIRModels.git", from: "0.8.0"),
-        .package(url: "https://github.com/StanfordSpezi/Spezi.git", from: "1.8.1"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziFoundation.git", branch: "localizations-dictionary"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziHealthKit.git", from: "1.3.2"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziScheduler.git", from: "1.2.14"),
+        .package(url: "https://github.com/StanfordSpezi/Spezi.git", from: "1.10.1"),
+        .package(url: "https://github.com/StanfordSpezi/SpeziFoundation.git", branch: "localizations-dictionary"), // TODO
+        .package(url: "https://github.com/StanfordSpezi/SpeziHealthKit.git", branch: "lukas/linux-support"), // TODO
+        .package(url: "https://github.com/StanfordSpezi/SpeziScheduler.git", from: "1.2.18"),
         .package(url: "https://github.com/StanfordSpezi/SpeziStorage.git", from: "2.1.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.4"),
         .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.2.1")

Sources/SpeziStudy/Study Manager/StudyManager.swift

@@ -316,7 +316,7 @@ extension StudyManager {
                 $0.id.starts(with: prefix) && !activeTaskIds.contains($0.id)
             })) ?? []
             for orphanedTask in orphanedTasks {
-                logger.notice("Deleting orphaned Task for study '\(study.metadata.title.localizedString() ?? "")' (\(study.id)): \(orphanedTask)")
+                logger.notice("Deleting orphaned Task for study '\(study.metadata.title[.enUS] ?? "")' (\(study.id)): \(orphanedTask)")
                 try scheduler.deleteAllVersions(of: orphanedTask)
             }
         }
@@ -464,7 +464,7 @@ extension StudyManager {
 
     /// Unenroll from a study.
     public func unenroll(from enrollment: StudyEnrollment) async throws {
-        logger.notice("Unenrolling from study '\(enrollment.studyId)' (\(enrollment.studyBundle?.studyDefinition.metadata.title.localizedString() ?? ""))")
+        logger.notice("Unenrolling from study '\(enrollment.studyId)' (\(enrollment.studyBundle?.studyDefinition.metadata.title[.enUS] ?? ""))")
         do {
             // Delete all Tasks associated with this study.
             // Note that we do this by simply fetching & deleting all Tasks with a matching prefix,
@@ -644,7 +644,7 @@ extension StudyManager {
 extension StudyManager {
     private func handleStudyLifecycleEvent(_ event: StudyLifecycleEvent, for studyBundle: StudyBundle, at date: Date) {
         logger.notice(
-            "Handling study lifecycle event '\(String(describing: event))' for study \(studyBundle.id) (\(studyBundle.studyDefinition.metadata.title.localizedString() ?? ""))"
+            "Handling study lifecycle event '\(String(describing: event))' for study \(studyBundle.id) (\(studyBundle.studyDefinition.metadata.title[.enUS] ?? ""))"
         )
         let cal = preferredLocale.calendar
         for enrollment in studyEnrollments where enrollment.studyId == studyBundle.id {

Tests/UITests/TestApp/HomeTab.swift

@@ -65,7 +65,7 @@ struct HomeTab: View {
         let mockStudyV1 = try! mockStudy(revision: .v1) // swiftlint:disable:this force_try
         let mockStudyV2 = try! mockStudy(revision: .v2) // swiftlint:disable:this force_try
         let mockStudyV3 = try! mockStudy(revision: .v3) // swiftlint:disable:this force_try
-        AsyncButton("Enroll in \(mockStudyV1.studyDefinition.metadata.title) (v\(mockStudyV1.studyDefinition.studyRevision))", state: $viewState) {
+        AsyncButton("Enroll in \(mockStudyV1.studyDefinition.metadata.title[.enUS] ?? "") (v\(mockStudyV1.studyDefinition.studyRevision))", state: $viewState) {
             try await studyManager.enroll(in: mockStudyV1)
         }
         AsyncButton("Update enrollment to study revision 2", state: $viewState) {
@@ -88,7 +88,7 @@ struct HomeTab: View {
         VStack {
             if let study = enrollment.studyBundle?.studyDefinition {
                 HStack {
-                    Text(study.metadata.title)
+                    Text(study.metadata.title[.enUS] ?? "")
                         .font(.headline)
                 }
             }

Tests/UITests/TestApp/MockStudy.swift

@@ -57,9 +57,9 @@ func mockStudy(revision: MockStudyRevision) throws -> StudyBundle { // swiftlint
         studyRevision: revision.rawValue,
         metadata: StudyDefinition.Metadata(
             id: .studyId,
-            title: "TestStudy",
-            explanationText: "This is a fake study, intended for testing the SpeziStudy package.",
-            shortExplanationText: "SpeziStudy fake test study",
+            title: .init([.enUS: "TestStudy"]),
+            explanationText: .init([.enUS: "This is a fake study, intended for testing the SpeziStudy package."]),
+            shortExplanationText: .init([.enUS: "SpeziStudy fake test study"]),
             participationCriterion: .ageAtLeast(18) && !.ageAtLeast(60) && (.isFromRegion(.unitedStates) || .isFromRegion(.unitedKingdom)) && .speaksLanguage(.english),
             // swiftlint:disable:previous line_length
             enrollmentConditions: .none

Tests/UITests/TestAppUITests/TestAppUITests.swift

@@ -39,6 +39,7 @@ class TestAppUITests: XCTestCase {
         let enrollmentDateText = DateFormatter.localizedString(from: .now, dateStyle: .short, timeStyle: .none)
         XCTAssert(app.staticTexts["Enrollment Date, \(enrollmentDateText)"].waitForExistence(timeout: 1))
 
+        app.swipeUp()
         XCTAssert(app.staticTexts["Article1 Title"].waitForExistence(timeout: 1))
         XCTAssert(app.staticTexts["Social Support"].waitForExistence(timeout: 1))
 
@@ -52,6 +53,7 @@ class TestAppUITests: XCTestCase {
         // update the study to a newer version.
         // going from 1 to 2 will remove the questionnaire component.
         // since the informational component remains, and has already been completed, we expect it to stay completed.
+        app.swipeDown()
         app.buttons["Update enrollment to study revision 2"].tap()
         XCTAssert(app.staticTexts["Study Revision, 2"].waitForExistence(timeout: 1))
         XCTAssert(completeWelcomeArticleButton.waitForNonExistence(timeout: 1))