From e059392ae3a85d52757ae06f1cb0c3baeab42212 Mon Sep 17 00:00:00 2001 From: Lukas Kollmer Date: Fri, 19 Jun 2026 09:47:50 +0200 Subject: [PATCH 1/6] update deps --- Package.swift | 26 +++++++------------ .../MHCStudyDefinitionExporter/Study.swift | 12 ++++----- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Package.swift b/Package.swift index 124f975..7753d32 100644 --- a/Package.swift +++ b/Package.swift @@ -17,7 +17,6 @@ let package = Package( platforms: [ .iOS(.v18), .watchOS(.v11), - .visionOS(.v2), .macOS(.v15), .macCatalyst(.v18) ], @@ -27,17 +26,14 @@ let package = Package( .executable(name: "MHCStudyDefinitionExporterCLI", targets: ["MHCStudyDefinitionExporterCLI"]) ], dependencies: [ - .package(url: "https://github.com/StanfordSpezi/SpeziStudy.git", .upToNextMinor(from: "0.1.19")), - .package(url: "https://github.com/StanfordSpezi/SpeziFoundation.git", from: "2.4.0"), - .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.6.2"), - // not used directly but we need to fix it below 0.9.0 for the time being - .package(url: "https://github.com/apple/FHIRModels.git", .upToNextMinor(from: "0.8.0")) + .package(url: "https://github.com/SchmiedmayerLab/Spezi.git", branch: "monorepo-import"), + .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.6.2") ], targets: [ .target( name: "MHCStudyDefinition", dependencies: [ - .product(name: "SpeziStudyDefinition", package: "SpeziStudy") + .product(name: "SpeziStudyDefinition", package: "Spezi") ], resources: [.process("Resources")] ), @@ -45,34 +41,32 @@ let package = Package( name: "MHCStudyDefinitionExporter", dependencies: [ "MHCStudyDefinition", - .product(name: "SpeziStudyDefinition", package: "SpeziStudy"), - .product(name: "SpeziStudy", package: "SpeziStudy"), - .product(name: "SpeziLocalization", package: "SpeziFoundation") + .product(name: "SpeziStudyDefinition", package: "Spezi"), + .product(name: "SpeziStudy", package: "Spezi"), + .product(name: "SpeziLocalization", package: "Spezi") ], resources: [ .copy("Resources/consent"), .copy("Resources/article"), .copy("Resources/questionnaire"), .copy("Resources/hhdExplainer") - ], - swiftSettings: [.defaultIsolation(MainActor.self)] + ] ), .executableTarget( name: "MHCStudyDefinitionExporterCLI", dependencies: [ "MHCStudyDefinition", "MHCStudyDefinitionExporter", - .product(name: "SpeziStudyDefinition", package: "SpeziStudy"), + .product(name: "SpeziStudyDefinition", package: "Spezi"), .product(name: "ArgumentParser", package: "swift-argument-parser") - ], - swiftSettings: [.defaultIsolation(MainActor.self)] + ] ), .testTarget( name: "MHCStudyDefinitionExporterTests", dependencies: [ "MHCStudyDefinition", "MHCStudyDefinitionExporter", - .product(name: "SpeziStudyDefinition", package: "SpeziStudy") + .product(name: "SpeziStudyDefinition", package: "Spezi") ] ) ] diff --git a/Sources/MHCStudyDefinitionExporter/Study.swift b/Sources/MHCStudyDefinitionExporter/Study.swift index 2f202ea..4353b45 100644 --- a/Sources/MHCStudyDefinitionExporter/Study.swift +++ b/Sources/MHCStudyDefinitionExporter/Study.swift @@ -12,6 +12,7 @@ import Foundation import MHCStudyDefinition import SpeziHealthKit import enum SpeziHealthKitBulkExport.ExportSessionStartDate +import SpeziLocalization import SpeziScheduler import SpeziStudyDefinition @@ -38,17 +39,16 @@ extension StudyBundle.FileReference { let mhcStudyDefinition = StudyDefinition( - studyRevision: 40, + studyRevision: 41, metadata: .init( id: .mhcStudy, - title: "My Heart Counts", - shortTitle: "MHC", + title: [.enUS: "My Heart Counts"], + shortTitle: [.enUS: "MHC"], icon: .systemSymbol("cube.transparent"), - explanationText: "", - shortExplanationText: "Improve your cardiovascular health", + explanationText: [:], + shortExplanationText: [.enUS: "Improve your cardiovascular health"], studyDependency: nil, participationCriterion: .ageAtLeast(18) && (.isFromRegion(.unitedStates) || .isFromRegion(.unitedKingdom)), - enrollmentConditions: .none, consentFileRef: .init(category: .consent, filename: "Consent", fileExtension: "md") ), components: [ From 08d8df59db886a69df38c4be6251a2e28e93d814 Mon Sep 17 00:00:00 2001 From: Lukas Kollmer Date: Fri, 19 Jun 2026 10:17:54 +0200 Subject: [PATCH 2/6] x --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 7753d32..b8cd93d 100644 --- a/Package.swift +++ b/Package.swift @@ -26,7 +26,7 @@ let package = Package( .executable(name: "MHCStudyDefinitionExporterCLI", targets: ["MHCStudyDefinitionExporterCLI"]) ], dependencies: [ - .package(url: "https://github.com/SchmiedmayerLab/Spezi.git", branch: "monorepo-import"), + .package(url: "https://github.com/SchmiedmayerLab/Spezi.git", revision: "d0f1e1cee93392ee7a0d64849a8dbf107d98a39e"), .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.6.2") ], targets: [ From 69ee8f232152a300438ca20b88b6a5069b2259a9 Mon Sep 17 00:00:00 2001 From: Lukas Kollmer Date: Wed, 24 Jun 2026 19:17:31 +0200 Subject: [PATCH 3/6] update spezi to 0.1.0 --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index b8cd93d..45d01c4 100644 --- a/Package.swift +++ b/Package.swift @@ -26,7 +26,7 @@ let package = Package( .executable(name: "MHCStudyDefinitionExporterCLI", targets: ["MHCStudyDefinitionExporterCLI"]) ], dependencies: [ - .package(url: "https://github.com/SchmiedmayerLab/Spezi.git", revision: "d0f1e1cee93392ee7a0d64849a8dbf107d98a39e"), + .package(url: "https://github.com/SchmiedmayerLab/Spezi.git", .upToNextMinor(from: "0.1.0")), .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.6.2") ], targets: [ From db38be47d08c32e29a8ffc48cafba4c4e98befd1 Mon Sep 17 00:00:00 2001 From: Lukas Kollmer Date: Wed, 24 Jun 2026 19:21:45 +0200 Subject: [PATCH 4/6] ugh --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 45d01c4..0d37e96 100644 --- a/Package.swift +++ b/Package.swift @@ -26,7 +26,7 @@ let package = Package( .executable(name: "MHCStudyDefinitionExporterCLI", targets: ["MHCStudyDefinitionExporterCLI"]) ], dependencies: [ - .package(url: "https://github.com/SchmiedmayerLab/Spezi.git", .upToNextMinor(from: "0.1.0")), + .package(url: "https://github.com/SchmiedmayerLab/Spezi.git", revision: "fe1fad25ddec0dfb7d7e10ced4658e945dec6638"), .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.6.2") ], targets: [ From 0dd1f59051c447ecbff4d21e936c801d48b0e530 Mon Sep 17 00:00:00 2001 From: Lukas Kollmer Date: Wed, 24 Jun 2026 19:22:42 +0200 Subject: [PATCH 5/6] hmmmmmmmmm --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 0d37e96..45d01c4 100644 --- a/Package.swift +++ b/Package.swift @@ -26,7 +26,7 @@ let package = Package( .executable(name: "MHCStudyDefinitionExporterCLI", targets: ["MHCStudyDefinitionExporterCLI"]) ], dependencies: [ - .package(url: "https://github.com/SchmiedmayerLab/Spezi.git", revision: "fe1fad25ddec0dfb7d7e10ced4658e945dec6638"), + .package(url: "https://github.com/SchmiedmayerLab/Spezi.git", .upToNextMinor(from: "0.1.0")), .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.6.2") ], targets: [ From a188696ffe16e5db982c62ee9859c474f2d6da3a Mon Sep 17 00:00:00 2001 From: Lukas Kollmer Date: Thu, 25 Jun 2026 14:02:11 +0200 Subject: [PATCH 6/6] add a spanish explainer --- Sources/MHCStudyDefinitionExporter/Study.swift | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Sources/MHCStudyDefinitionExporter/Study.swift b/Sources/MHCStudyDefinitionExporter/Study.swift index 4353b45..fe94d0d 100644 --- a/Sources/MHCStudyDefinitionExporter/Study.swift +++ b/Sources/MHCStudyDefinitionExporter/Study.swift @@ -46,7 +46,10 @@ let mhcStudyDefinition = StudyDefinition( shortTitle: [.enUS: "MHC"], icon: .systemSymbol("cube.transparent"), explanationText: [:], - shortExplanationText: [.enUS: "Improve your cardiovascular health"], + shortExplanationText: [ + .enUS: "Improve your cardiovascular health", + .esES: "Mejora tu salud cardiovascular" + ], studyDependency: nil, participationCriterion: .ageAtLeast(18) && (.isFromRegion(.unitedStates) || .isFromRegion(.unitedKingdom)), consentFileRef: .init(category: .consent, filename: "Consent", fileExtension: "md") @@ -327,3 +330,8 @@ let mhcStudyDefinition = StudyDefinition( ) } ) + + +extension LocalizationKey { + static let esES = Self(language: .init(identifier: "es"), region: .spain) +}