Skip to content

Commit 627d2c7

Browse files
authored
update to use FHIRModelsExtensions (#101)
# update to use FHIRModelsExtensions ## ♻️ Current situation & Problem moves a buch of stuff to the new https://github.com/StanfordBDHG/FHIRModelsExtensions repo ## ⚙️ Release Notes - FHIRPathParser and some other things have been moved into the https://github.com/StanfordBDHG/FHIRModelsExtensions repository ## 📚 Documentation some remains; some moved elsewhere ## ✅ Testing some remains; some moved elsewhere ### Code of Conduct & Contributing Guidelines By creating and submitting this pull request, you agree to follow our [Code of Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md): - [x] I agree to follow the [Code of Conduct](https://github.com/StanfordBDHG/.github/blob/main/CODE_OF_CONDUCT.md) and [Contributing Guidelines](https://github.com/StanfordBDHG/.github/blob/main/CONTRIBUTING.md).
1 parent 67cca59 commit 627d2c7

File tree

55 files changed

+20
-6980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+20
-6980
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fail-fast: false
3333
with:
3434
runsonlabels: '["macOS", "self-hosted"]'
35-
scheme: ResearchKitOnFHIR-Package
35+
scheme: ResearchKitOnFHIR
3636
destination: ${{ matrix.platform.destination }}
3737
buildConfig: ${{ matrix.config }}
3838
resultBundle: ${{ format('ResearchKitOnFHIR-{0}-{1}.xcresult', matrix.platform.name, matrix.config) }}

Package.swift

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ let package = Package(
2121
.macOS(.v14)
2222
],
2323
products: [
24-
.library(name: "ResearchKitOnFHIR", targets: ["ResearchKitOnFHIR"]),
25-
.library(name: "FHIRQuestionnaires", targets: ["FHIRQuestionnaires"]),
26-
.library(name: "FHIRPathParser", targets: ["FHIRPathParser"])
24+
.library(name: "ResearchKitOnFHIR", targets: ["ResearchKitOnFHIR"])
2725
],
2826
dependencies: [
2927
.package(url: "https://github.com/StanfordBDHG/ResearchKit.git", .upToNextMinor(from: "3.1.1")),
3028
.package(url: "https://github.com/apple/FHIRModels.git", from: "0.7.0"),
31-
.package(url: "https://github.com/antlr/antlr4.git", from: "4.13.1")
29+
.package(url: "https://github.com/StanfordBDHG/FHIRModelsExtensions.git", from: "0.1.0")
3230
] + swiftLintPackage(),
3331
targets: [
3432
.target(
@@ -37,54 +35,16 @@ let package = Package(
3735
.product(name: "ResearchKit", package: "ResearchKit"),
3836
.product(name: "ResearchKitSwiftUI", package: "ResearchKit"),
3937
.product(name: "ModelsR4", package: "FHIRModels"),
40-
.target(name: "FHIRPathParser")
41-
],
42-
plugins: [] + swiftLintPlugin()
43-
),
44-
.target(
45-
name: "FHIRQuestionnaires",
46-
dependencies: [
47-
.product(name: "ModelsR4", package: "FHIRModels")
48-
],
49-
resources: [
50-
.copy("Resources/SkipLogicExample.json"),
51-
.copy("Resources/TextValidationExample.json"),
52-
.copy("Resources/ContainedValueSetExample.json"),
53-
.copy("Resources/NumberExample.json"),
54-
.copy("Resources/DateTimeExample.json"),
55-
.copy("Resources/PHQ-9.json"),
56-
.copy("Resources/GAD-7.json"),
57-
.copy("Resources/GCS.json"),
58-
.copy("Resources/IPSS.json"),
59-
.copy("Resources/FormExample.json"),
60-
.copy("Resources/MultipleEnableWhen.json"),
61-
.copy("Resources/ImageCapture.json"),
62-
.copy("Resources/SliderExample.json")
63-
],
64-
plugins: [] + swiftLintPlugin()
65-
),
66-
.target(
67-
name: "FHIRPathParser",
68-
dependencies: [
69-
.product(name: "Antlr4", package: "antlr4")
70-
],
71-
exclude: [
72-
"ANTLUtils"
38+
.product(name: "FHIRModelsExtensions", package: "FHIRModelsExtensions"),
39+
.product(name: "FHIRPathParser", package: "FHIRModelsExtensions")
7340
],
7441
plugins: [] + swiftLintPlugin()
7542
),
7643
.testTarget(
7744
name: "ResearchKitOnFHIRTests",
7845
dependencies: [
79-
.target(name: "ResearchKitOnFHIR"),
80-
.target(name: "FHIRQuestionnaires")
81-
],
82-
plugins: [] + swiftLintPlugin()
83-
),
84-
.testTarget(
85-
name: "FHIRPathParserTests",
86-
dependencies: [
87-
.target(name: "FHIRPathParser")
46+
"ResearchKitOnFHIR",
47+
.product(name: "FHIRQuestionnaires", package: "FHIRModelsExtensions")
8848
],
8949
plugins: [] + swiftLintPlugin()
9050
)

Sources/FHIRPathParser/ANTLUtils/FHIRPath.g4

Lines changed: 0 additions & 182 deletions
This file was deleted.

Sources/FHIRPathParser/ANTLUtils/FHIRPath.g4.license

Lines changed: 0 additions & 6 deletions
This file was deleted.

Sources/FHIRPathParser/ANTLUtils/README.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

Sources/FHIRPathParser/ANTLUtils/generate.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

Sources/FHIRPathParser/ANTLUtils/generate.sh.license

Lines changed: 0 additions & 6 deletions
This file was deleted.

Sources/FHIRPathParser/Date+FHIRPathValue.swift

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)