Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
23 changes: 4 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,12 @@ jobs:
include:
- id: jvm
label: JVM/Desktop
tasks: >-
:ohs-player-library:jvmTest
:ohs-player-reference-app:jvmTest
tasks: ':ohs-player-reference-app:jvmTest'
kotlinDaemonHeap: '-Xmx6g -XX:+UseG1GC'
extraArgs: ''
- id: android
label: Android
# ohs-player-library uses the androidKotlinMultiplatformLibrary
# plugin, which doesn't register `lintDebug` - assembleAndroidMain
# is the closest "compile + verify the Android variant" task it
# exposes. ohs-player-reference-app uses classic androidTarget
# and keeps lintDebug.
tasks: >-
:ohs-player-library:assembleAndroidMain
:ohs-player-reference-app:lintDebug
tasks: ':ohs-player-reference-app:lintDebug'
kotlinDaemonHeap: '-Xmx6g -XX:+UseG1GC'
extraArgs: ''
- id: js
Expand All @@ -86,14 +77,9 @@ jobs:
extraArgs: ''
- id: wasm
label: Kotlin/Wasm
tasks: >-
:ohs-player-library:wasmJsBrowserTest
:ohs-player-reference-app:wasmJsBrowserTest
tasks: ':ohs-player-reference-app:wasmJsBrowserTest'
kotlinDaemonHeap: '-Xmx10g -XX:+UseG1GC'
# Serialize the library + reference-app wasm compiles so they
# don't run concurrently as workers and double the daemon heap
# demand even at 10g.
extraArgs: '--max-workers=1'
extraArgs: ''
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -162,5 +148,4 @@ jobs:
- name: Compile + link ${{ matrix.label }}
run: |
./gradlew --stacktrace \
:ohs-player-library:compileKotlin${{ matrix.target }} \
:ohs-player-reference-app:linkDebugFramework${{ matrix.target }}
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ cd ohs-player-reference-client-app

Code generation is part of compilation. The `ig-codegen` Gradle plugin runs its `generateIgCode` task automatically before Kotlin compilation, so there is no separate generation step.

The OHS Player Reference library lives in its own repository, [`ohs-player-reference-client-library`](https://github.com/ohs-foundation/ohs-player-reference-client-library), and is consumed as the Maven artifact `dev.ohs.player:reference-library:1.0.0-alpha01`.

Comment thread
FikriMilano marked this conversation as resolved.
Outdated
### Run

| Target | Command |
Expand Down Expand Up @@ -286,13 +288,13 @@ Adding a field is a configuration change: add a column to the `ViewDefinition`,
Run all multiplatform tests:

```shell
./gradlew :ohs-player-library:allTests :ohs-player-reference-app:allTests
./gradlew :ohs-player-reference-app:allTests
```

Run JVM tests only:

```shell
./gradlew :ohs-player-library:jvmTest :ohs-player-reference-app:jvmTest
./gradlew :ohs-player-reference-app:jvmTest
```
Comment thread
FikriMilano marked this conversation as resolved.
Outdated

## Deployment
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ navigation-compose = "2.9.2"
material3 = "1.10.0-alpha05"
kotlinxSerializationJson = "1.11.0"
spotless = "8.6.0"
ohsPlayerReferenceLibrary = "1.0.0-alpha01"
ohsFhirModel = "1.0.0-beta05"
ohsFhirPath = "1.0.0-beta03"
kotlinxDatetime = "0.8.0"
Expand Down Expand Up @@ -59,6 +60,7 @@ kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version
kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
ohs-player-reference-library = { module = "dev.ohs.player:reference-library", version.ref = "ohsPlayerReferenceLibrary" }
ohs-fhir-model = { module = "dev.ohs.fhir:fhir-model", version.ref = "ohsFhirModel" }
ohs-fhir-path = { module = "dev.ohs.fhir:fhir-path", version.ref = "ohsFhirPath" }
ionspin-bignum = { module = "com.ionspin.kotlin:bignum", version.ref = "ionspin-bignum" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ViewTypeGenerator(
private val outputDir: File,
) {

private val viewTypeClass = ClassName("dev.ohs.player.library.registry", "ViewType")
private val viewTypeClass = ClassName("dev.ohs.player.reference.library.registry", "ViewType")

fun generate(codeSystem: CodeSystem) {
FileSpec.builder("$basePackage.$subPackage", codeSystem.name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import kotlinx.serialization.Serializable
* Codegen view of a ViewDefinition — only the fields code generation needs to derive the typed
* state class: the resource and its column tree. Runtime concerns the generator never reads
* (`constant`, `where`, `status`, …) are intentionally omitted; the full SQL-on-FHIR model lives in
* the library (`dev.ohs.player.library.config.ViewDefinition`), where extraction uses them. Unknown
* the library (`dev.ohs.player.reference.library.config.ViewDefinition`), where extraction uses them. Unknown
* JSON keys are ignored on decode.
*/
@Serializable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private val fhirDateClass = ClassName("dev.ohs.fhir.model.r4", "FhirDate")
private val fhirDateTimeClass = ClassName("dev.ohs.fhir.model.r4", "FhirDateTime")
private val bigDecimalClass = ClassName("com.ionspin.kotlin.bignum.decimal", "BigDecimal")

private const val SERIALIZER_PKG = "dev.ohs.player.library.config"
private const val SERIALIZER_PKG = "dev.ohs.player.reference.library.config"
private val fhirDateSerializer = ClassName(SERIALIZER_PKG, "FhirDateSerializer")
private val fhirDateTimeSerializer = ClassName(SERIALIZER_PKG, "FhirDateTimeSerializer")
private val fhirDecimalSerializer = ClassName(SERIALIZER_PKG, "FhirDecimalSerializer")
Expand Down
107 changes: 0 additions & 107 deletions ohs-player-library/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading