Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Module Reorganization #58

Merged
merged 3 commits into from
Apr 8, 2023
Merged

Module Reorganization #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c41789c
Move Modules outside of the main repo
PSchmiedmayer Apr 8, 2023
becb990
Update GitHub Actions & SwiftLint
PSchmiedmayer Apr 8, 2023
b12ed98
Update GitHub Actions
PSchmiedmayer Apr 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@ jobs:
name: Build and Test UI Tests
uses: StanfordBDHG/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
with:
artifactname: UITests.xcresult
artifactname: TestApp.xcresult
runsonlabels: '["macOS", "self-hosted"]'
setupfirebaseemulator: true
path: Tests/UITests
customcommand: |
firebase emulators:exec 'set -o pipefail && xcodebuild test -project UITests.xcodeproj -scheme TestApp -destination "name=iPhone 14 Pro Max" -resultBundlePath UITests.xcresult -derivedDataPath ".derivedData" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty'
scheme: TestApp
uploadcoveragereport:
name: Upload Coverage Report
needs: [buildandtest, buildandtestuitests]
uses: StanfordBDHG/.github/.github/workflows/create-and-upload-coverage-report.yml@v2
with:
coveragereports: CardinalKit-Package.xcresult UITests.xcresult
coveragereports: CardinalKit-Package.xcresult TestApp.xcresult
203 changes: 7 additions & 196 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.7
// swift-tools-version:5.8

//
// This source file is part of the CardinalKit open-source project
Expand All @@ -18,219 +18,30 @@ let package = Package(
.iOS(.v16)
],
products: [
.library(name: "Account", targets: ["Account"]),
.library(name: "CardinalKit", targets: ["CardinalKit"]),
.library(name: "Contact", targets: ["Contact"]),
.library(name: "FHIR", targets: ["FHIR"]),
.library(name: "FHIRMockDataStorageProvider", targets: ["FHIRMockDataStorageProvider"]),
.library(name: "FHIRToFirestoreAdapter", targets: ["FHIRToFirestoreAdapter"]),
.library(name: "FirestoreDataStorage", targets: ["FirestoreDataStorage"]),
.library(name: "FirestoreStoragePrefixUserIdAdapter", targets: ["FirestoreStoragePrefixUserIdAdapter"]),
.library(name: "FirebaseConfiguration", targets: ["FirebaseConfiguration"]),
.library(name: "FirebaseAccount", targets: ["FirebaseAccount"]),
.library(name: "HealthKitDataSource", targets: ["HealthKitDataSource"]),
.library(name: "HealthKitToFHIRAdapter", targets: ["HealthKitToFHIRAdapter"]),
.library(name: "LocalStorage", targets: ["LocalStorage"]),
.library(name: "Onboarding", targets: ["Onboarding"]),
.library(name: "Scheduler", targets: ["Scheduler"]),
.library(name: "Questionnaires", targets: ["Questionnaires"]),
.library(name: "SecureStorage", targets: ["SecureStorage"]),
.library(name: "Views", targets: ["Views"]),
.library(name: "XCTRuntimeAssertions", targets: ["XCTRuntimeAssertions"])
.library(name: "XCTCardinalKit", targets: ["XCTCardinalKit"])
],
dependencies: [
.package(url: "https://github.com/apple/FHIRModels", .upToNextMinor(from: "0.4.0")),
.package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.5.0"),
.package(url: "https://github.com/StanfordBDHG/HealthKitOnFHIR", .upToNextMinor(from: "0.2.2")),
.package(url: "https://github.com/StanfordBDHG/ResearchKit", from: "2.2.8"),
.package(url: "https://github.com/StanfordBDHG/ResearchKitOnFHIR", .upToNextMinor(from: "0.1.6"))
.package(url: "https://github.com/StanfordBDHG/XCTRuntimeAssertions", .upToNextMinor(from: "0.1.0"))
],
targets: [
.target(
name: "Account",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "Views")
],
resources: [
.process("Resources")
]
),
.target(
name: "CardinalKit",
dependencies: [
.target(name: "XCTRuntimeAssertions")
]
),
.testTarget(
name: "CardinalKitTests",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "XCTRuntimeAssertions")
]
),
.target(
name: "Contact",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "Views")
],
resources: [
.process("Resources")
.product(name: "XCTRuntimeAssertions", package: "XCTRuntimeAssertions")
]
),
.target(
name: "FHIR",
dependencies: [
.target(name: "CardinalKit"),
.product(name: "ModelsR4", package: "FHIRModels")
]
),
.testTarget(
name: "FHIRTests",
dependencies: [
.target(name: "FHIR")
]
),
.target(
name: "FirebaseConfiguration",
dependencies: [
.target(name: "CardinalKit"),
.product(name: "FirebaseFirestore", package: "firebase-ios-sdk")
]
),
.target(
name: "FirebaseAccount",
dependencies: [
.target(name: "Account"),
.target(name: "CardinalKit"),
.target(name: "FirebaseConfiguration"),
.product(name: "FirebaseAuth", package: "firebase-ios-sdk")
]
),
.target(
name: "FHIRMockDataStorageProvider",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "FHIR"),
.target(name: "Views")
],
resources: [
.process("Resources")
]
),
.target(
name: "FHIRToFirestoreAdapter",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "FHIR"),
.target(name: "FirestoreDataStorage")
]
),
.testTarget(
name: "FHIRToFirestoreAdapterTests",
dependencies: [
.target(name: "FHIRToFirestoreAdapter"),
.target(name: "FHIR"),
.product(name: "ModelsR4", package: "FHIRModels")
]
),
.target(
name: "FirestoreDataStorage",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "FirebaseConfiguration"),
.product(name: "FirebaseFirestore", package: "firebase-ios-sdk"),
.product(name: "FirebaseFirestoreSwift", package: "firebase-ios-sdk")
]
),
.target(
name: "FirestoreStoragePrefixUserIdAdapter",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "FirestoreDataStorage"),
.product(name: "FirebaseAuth", package: "firebase-ios-sdk")
]
),
.target(
name: "HealthKitDataSource",
dependencies: [
.target(name: "CardinalKit")
]
),
.target(
name: "HealthKitToFHIRAdapter",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "FHIR"),
.target(name: "HealthKitDataSource"),
.product(name: "ModelsR4", package: "FHIRModels"),
.product(name: "HealthKitOnFHIR", package: "HealthKitOnFHIR")
]
),
.target(
name: "LocalStorage",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "SecureStorage")
]
),
.testTarget(
name: "LocalStorageTests",
dependencies: [
.target(name: "LocalStorage")
]
),
.target(
name: "Onboarding",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "Views")
],
resources: [
.process("Resources")
]
),
.target(
name: "Questionnaires",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "FHIR"),
.product(name: "ModelsR4", package: "FHIRModels"),
.product(name: "ResearchKitOnFHIR", package: "ResearchKitOnFHIR"),
.product(name: "FHIRQuestionnaires", package: "ResearchKitOnFHIR"),
.product(name: "ResearchKit", package: "ResearchKit")
]
),
.target(
name: "Scheduler",
name: "XCTCardinalKit",
dependencies: [
.target(name: "CardinalKit")
]
),
.testTarget(
name: "SchedulerTests",
dependencies: [
.target(name: "Scheduler")
]
),
.target(
name: "SecureStorage",
name: "CardinalKitTests",
dependencies: [
.target(name: "CardinalKit"),
.target(name: "XCTRuntimeAssertions")
]
),
.target(
name: "Views"
),
.target(
name: "XCTRuntimeAssertions"
),
.testTarget(
name: "XCTRuntimeAssertionsTests",
dependencies: [
.target(name: "XCTRuntimeAssertions")
.product(name: "XCTRuntimeAssertions", package: "XCTRuntimeAssertions")
]
)
]
Expand Down
Loading