Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ permissions:
contents: read

jobs:
ui-test-projects:
name: UI Test Project Consistency
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Verify generated UI test projects
run: python3 Scripts/generate-ui-test-projects.py --check

reuse:
name: REUSE Compliance Check
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ coverage.lcov

# IDE related folders
.idea
.vscode

# Xcode User settings
xcuserdata/
Expand Down
1 change: 0 additions & 1 deletion .spi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ builder:
- XCTHealthKit
- RuntimeAssertions
- RuntimeAssertionsTesting
- XCTRuntimeAssertions
- XCTestApp
- XCTestExtensions
- SpeziSchedulerUI
Expand Down
31 changes: 29 additions & 2 deletions .swiftpm/xcode/xcshareddata/xcschemes/Spezi-Tests.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<TestPlans>
<TestPlanReference
reference = "container:Tests/TestPlans/FHIRModelsExtensions.xctestplan" default = "YES">
reference = "container:Tests/TestPlans/FHIRModelsExtensions.xctestplan"
default = "YES">
</TestPlanReference>
<TestPlanReference
reference = "container:Tests/TestPlans/HealthKitOnFHIR.xctestplan">
Expand Down Expand Up @@ -106,11 +107,37 @@
reference = "container:Tests/TestPlans/XCTHealthKit.xctestplan">
</TestPlanReference>
<TestPlanReference
reference = "container:Tests/TestPlans/XCTRuntimeAssertions.xctestplan">
reference = "container:Tests/TestPlans/RuntimeAssertions.xctestplan">
</TestPlanReference>
<TestPlanReference
reference = "container:Tests/TestPlans/XCTestExtensions.xctestplan">
</TestPlanReference>
</TestPlans>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
queueDebuggingEnabled = "No">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
47 changes: 8 additions & 39 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,9 @@ var products: [Product] = [
.library(name: "SpeziValidation", targets: ["SpeziValidation"]),
// MARK: XCTHealthKit
.library(name: "XCTHealthKit", targets: ["XCTHealthKit"]),
// MARK: XCTRuntimeAssertions
// MARK: RuntimeAssertions
.library(name: "RuntimeAssertions", targets: ["RuntimeAssertions"]),
.library(name: "RuntimeAssertionsTesting", targets: ["RuntimeAssertionsTesting"]),
.library(name: "XCTRuntimeAssertions", targets: ["XCTRuntimeAssertions"]),
// MARK: XCTestExtensions
.library(name: "XCTestApp", targets: ["XCTestApp"]),
.library(name: "XCTestExtensions", targets: ["XCTestExtensions"])
Expand Down Expand Up @@ -443,7 +442,6 @@ var targets: [Target] = [
dependencies: [
.target(name: "Spezi"),
.target(name: "SpeziTesting"),
.target(name: "RuntimeAssertionsTesting"),
.product(name: "TestingExpectation", package: "swift-testing-expectation")
],
exclude: testTargetExcludes("SpeziTests", additional: ["UITests"]),
Expand Down Expand Up @@ -542,7 +540,6 @@ var targets: [Target] = [
dependencies: [
.target(name: "SpeziAccount"),
.target(name: "SpeziAccountPhoneNumbers"),
.target(name: "XCTRuntimeAssertions"),
.target(name: "Spezi"),
.target(name: "SpeziTesting"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing", condition: .when(platforms: [.iOS]))
Expand Down Expand Up @@ -1023,8 +1020,7 @@ var targets: [Target] = [
.testTarget(
name: "SpeziFoundationTests",
dependencies: [
.target(name: "SpeziFoundation"),
.target(name: "RuntimeAssertionsTesting")
.target(name: "SpeziFoundation")
],
exclude: testTargetExcludes("SpeziFoundationTests", additional: ["UITests"]),
swiftSettings: defaultSwiftSettings,
Expand Down Expand Up @@ -1746,13 +1742,11 @@ var targets: [Target] = [
swiftSettings: defaultSwiftSettings,
plugins: [] + defaultPlugins
),
// MARK: XCTRuntimeAssertions
// MARK: RuntimeAssertions
.target(
name: "RuntimeAssertions",
exclude: targetExcludes("RuntimeAssertions"),
swiftSettings: defaultSwiftSettings + [
.swiftLanguageMode(.v5) // TODO we used to have a comment why this was important! bring it back! (also applies to the targets below)
],
swiftSettings: defaultSwiftSettings,
plugins: [] + defaultPlugins
),
.target(
Expand All @@ -1761,20 +1755,7 @@ var targets: [Target] = [
.target(name: "RuntimeAssertions")
],
exclude: targetExcludes("RuntimeAssertionsTesting"),
swiftSettings: defaultSwiftSettings + [
.swiftLanguageMode(.v5)
],
plugins: [] + defaultPlugins
),
.target(
name: "XCTRuntimeAssertions",
dependencies: [
.target(name: "RuntimeAssertions")
],
exclude: targetExcludes("XCTRuntimeAssertions"),
swiftSettings: defaultSwiftSettings + [
.swiftLanguageMode(.v5)
],
swiftSettings: defaultSwiftSettings,
plugins: [] + defaultPlugins
),
.testTarget(
Expand All @@ -1783,19 +1764,7 @@ var targets: [Target] = [
.target(name: "RuntimeAssertions"),
.target(name: "RuntimeAssertionsTesting")
],
swiftSettings: defaultSwiftSettings + [
.swiftLanguageMode(.v5)
],
plugins: [] + defaultPlugins
),
.testTarget(
name: "XCTRuntimeAssertionsTests",
dependencies: [
.target(name: "XCTRuntimeAssertions")
],
swiftSettings: defaultSwiftSettings + [
.swiftLanguageMode(.v5)
],
swiftSettings: defaultSwiftSettings,
plugins: [] + defaultPlugins
),
// MARK: XCTestExtensions
Expand Down Expand Up @@ -1857,7 +1826,6 @@ targets += [
.target(name: "SpeziSchedulerMacros"),
.target(name: "XCTSpezi"),
.target(name: "SpeziLocalStorage"),
.target(name: "XCTRuntimeAssertions"),
.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
.product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax")
],
Expand Down Expand Up @@ -1951,5 +1919,6 @@ let package = Package(
)
],
dependencies: dependencies,
targets: targets
targets: targets,
swiftLanguageModes: [.v6]
)
3 changes: 2 additions & 1 deletion REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ SPDX-FileCopyrightText = "2026 Stanford University and the project authors (see
SPDX-License-Identifier = "MIT"

# Monorepo infrastructure created during the migration (2026) that can't carry an inline SPDX header
# (JSON test plans, the shared Xcode test-host scheme, and the size-constrained SPI manifest).
# (JSON test plans, Xcode project files, the shared Xcode test-host scheme, and the size-constrained SPI manifest).
[[annotations]]
path = [
"Tests/TestPlans/**",
"**/project.pbxproj",
".swiftpm/xcode/xcshareddata/xcschemes/Spezi-Tests.xcscheme",
".spi.yml"
]
Expand Down
2 changes: 1 addition & 1 deletion Scripts/affected-test-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
# Any change to these means "run everything" (shared manifest / test infra / CI / lint / pkg defs).
GLOBAL_PREFIXES = (
"Package.swift", "Package@", "Package.resolved", "packages.toml",
".swiftlint.yml", ".github/", "Scripts/", "Tests/TestPlans/", ".swiftpm/",
".swiftlint.yml", ".github/", "Scripts/", "Tests/TestPlans/", "Tests/UITestProjects.toml", ".swiftpm/",
)

# TEMPORARY: limit UNIT-test scheduling to these platforms (macCatalyst/visionOS/tvOS excluded for
Expand Down
Loading
Loading