Skip to content

Use R4-specific fhir-model artifact, drop direct fhir-path dep #69

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

Draft
LZRS wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use R4-specific fhir-model artifact, drop direct fhir-path dep #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ The app combines the OHS Player library with the OHS Foundational Libraries. Ver
| Library | Purpose |
| --- | --- |
| [`dev.ohs.player:client`](https://github.com/ohs-foundation/player-client) | Config-driven views using flattened data from FHIR resources (the player) |
| `dev.ohs.fhir:fhir-model` | Typed Kotlin models for FHIR resources |
| `dev.ohs.fhir:fhir-path` | FHIRPath expression evaluation |
| `dev.ohs.fhir:fhir-model-r4` | Typed Kotlin models for FHIR R4 resources |
| `dev.ohs.fhir:fhir-engine` | Local FHIR store, search, and server sync |
| `dev.ohs.fhir:fhir-data-capture` | FHIR Structured Data Capture (questionnaires) |
| `dev.ohs.fhir:fhir-path` | FHIRPath evaluation; arrives transitively via the engine and data capture |

### Have an existing app?

Expand Down
6 changes: 2 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ ktor = "3.2.3"
material3 = "1.10.0-alpha05"
navigation-compose = "2.9.2"
ohsFhirEngine = "2.0.0-alpha02"
ohsFhirModel = "1.0.0-beta05"
ohsFhirPath = "1.0.0-beta03"
ohsFhirModelR4 = "1.0.0-beta05"
ohsPlayerClient = "1.0.0-alpha01"
spotless = "8.6.0"

Expand Down Expand Up @@ -95,8 +94,7 @@ ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "kto
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
ohs-fhir-engine = { module = "dev.ohs.fhir:fhir-engine", version.ref = "ohsFhirEngine" }
ohs-fhir-model = { module = "dev.ohs.fhir:fhir-model", version.ref = "ohsFhirModel" }
ohs-fhir-path = { module = "dev.ohs.fhir:fhir-path", version.ref = "ohsFhirPath" }
ohs-fhir-model-r4 = { module = "dev.ohs.fhir:fhir-model-r4", version.ref = "ohsFhirModelR4" }
ohs-player-client = { module = "dev.ohs.player:client", version.ref = "ohsPlayerClient" }
spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }

Expand Down
7 changes: 5 additions & 2 deletions reference-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,11 @@ kotlin {
implementation(libs.koin.compose)
implementation(libs.koin.composeViewmodel)
implementation(libs.ohs.fhir.engine)
implementation(libs.ohs.fhir.model)
implementation(libs.ohs.fhir.path)
// R4-only artifact, not the `fhir-model` umbrella that also pulls in R4B and R5. No
// `fhir-path-r4` counterpart: nothing here uses dev.ohs.fhir.fhirpath, and the pre-split
// fhir-path :fhir-engine and :fhir-data-capture pull in has to stay — beta04+ moved
// `FhirPathEngine.Companion.forR4()`, which both of them call.
implementation(libs.ohs.fhir.model.r4)
implementation(libs.fhir.data.capture)
// Auth: shared OAuth2/PKCE client, secure session storage, SHA-256 for PKCE.
implementation(libs.ktor.client.core)
Expand Down
Loading