Merge branch 'release/1.1.0' into main

.github/workflows/gradle.yml

@@ -0,0 +1,74 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Native Distributions
+
+on:
+  push:
+    branches: [ develop, main ]
+  pull_request:
+    branches: [ develop, main ]
+
+jobs:
+  build-ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: JDK Ubuntu
+      uses: actions/setup-java@v2
+      with:
+        java-package: jdk+fx
+        java-version: '17'
+        distribution: 'zulu'
+    - name: Gradle Ubuntu
+      uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
+      with:
+        arguments: -PcomposeBuildOs=ubuntu packageDeb
+    - name: Upload DEB
+      uses: actions/[email protected]
+      with:
+        name: ubuntu
+        path: build/compose/binaries/main/deb
+  build-windows:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: JDK Windows
+      uses: actions/setup-java@v2
+      with:
+        java-package: jdk+fx
+        java-version: '17'
+        distribution: 'zulu'
+    - name: Gradle Windows
+      uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
+      with:
+        arguments: -PcomposeBuildOs=windows packageExe
+    - name: Upload EXE
+      uses: actions/[email protected]
+      with:
+        name: windows
+        path: build/compose/binaries/main/exe
+  build-mac:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: JDK macOS
+      uses: actions/setup-java@v2
+      with:
+        java-package: jdk+fx
+        java-version: '17'
+        distribution: 'zulu'
+    - name: Gradle Mac
+      uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
+      with:
+        arguments: -PcomposeBuildOs=mac packageDmg
+    - name: Upload DMG
+      uses: actions/[email protected]
+      with:
+        name: macos-intel
+        path: build/compose/binaries/main/dmg
+

build.gradle.kts

@@ -5,11 +5,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm") version "1.5.31"
     id("org.jetbrains.compose") version "1.0.0"
-    id("org.openjfx.javafxplugin") version "0.0.10"
+    id("org.openjfx.javafxplugin") version "0.0.11"
 }
-
+val projectVersion: String by project
 group = "de.uzl.itcr"
-version = "1.0.0"
+version = projectVersion
 
 repositories {
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
@@ -18,17 +18,21 @@ repositories {
 }
 
 val hapiVersion = "5.6.2"
-val slf4jVersion = "1.7.32"
+val slf4jVersion = "1.7.35"
 val graphStreamVersion = "2.0"
 val jGraphTVersion = "1.5.1"
 val material3DesktopVersion = "1.0.0"
 val jungraphtVersion = "1.3"
+val composeDesktopVersion = "1.0.1"
+val ktorVersion = "2.0.0-beta-1"
 
 dependencies {
     testImplementation(kotlin("test"))
     implementation(compose.desktop.currentOs)
-    implementation("org.jetbrains.compose.components:components-splitpane:1.0.1")
+    implementation("org.jetbrains.compose.components:components-splitpane:$composeDesktopVersion")
     implementation("org.jetbrains.compose.material3:material3-desktop:$material3DesktopVersion")
+    implementation("org.jetbrains.compose.material:material-icons-core-desktop:$composeDesktopVersion")
+    implementation("org.jetbrains.compose.material:material-icons-extended-desktop:$composeDesktopVersion")
     implementation("ca.uhn.hapi.fhir:hapi-fhir-base:$hapiVersion")
     implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:$hapiVersion")
     implementation("ca.uhn.hapi.fhir:hapi-fhir-validation:$hapiVersion")
@@ -43,7 +47,10 @@ dependencies {
     implementation("li.flor:native-j-file-chooser:1.6.4")
     implementation("javax.xml.bind:jaxb-api:2.4.0-b180830.0359") // provides org.xml.sax
     implementation("org.apache.commons:commons-lang3:3.12.0")
-    implementation("com.formdev:flatlaf:2.0")
+    implementation("com.formdev:flatlaf:2.0.1")
+    implementation("io.ktor:ktor-client-core:$ktorVersion")
+    implementation("io.ktor:ktor-client-cio:$ktorVersion")
+    implementation("me.xdrop:fuzzywuzzy:1.4.0")
 }
 
 tasks.test {
@@ -66,50 +73,60 @@ tasks.withType<KotlinCompile> {
     kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 }
 
+val composeBuildVersion: String by project
+val composeBuildOs: String? by project
+
 compose.desktop {
     application {
         mainClass = "terminodiff.MainKt"
-        nativeDistributions {
-            val resourceDir = project.layout.projectDirectory.dir("resources")
-            appResourcesRootDir.set(resourceDir)
-            licenseFile.set(project.file("LICENSE"))
-            packageName = "TerminoDiff"
-            packageVersion = "1.0.0"
-            description = "Visually compare HL7 FHIR Terminology"
-            vendor = "IT Center for Clinical Reserach, University of Lübeck"
-            copyright = "Joshua Wiedekopf / IT Center for Clinical Research, 2022-"
+        if (composeBuildOs != null) {
+            nativeDistributions {
+                val resourceDir = project.layout.projectDirectory.dir("resources")
+                appResourcesRootDir.set(resourceDir)
+                licenseFile.set(project.file("LICENSE"))
+                packageName = "TerminoDiff"
+                packageVersion = composeBuildVersion
+                description = "Visually compare HL7 FHIR Terminology"
+                vendor = "IT Center for Clinical Reserach, University of Lübeck"
+                copyright = "Joshua Wiedekopf / IT Center for Clinical Research, 2022-"
 
-            /*linux {
-                iconFile.set(resourceDir.file("common/terminodiff.png"))
-                rpmLicenseType = "GPL-3.0"
-                debMaintainer = "[email protected]"
-                appCategory = "Development"
-                targetFormats(
-                    // TargetFormat.Deb,
-                    TargetFormat.Rpm,
-                    TargetFormat.AppImage,
-                )
-            }*/
-            /*macOS {
-                jvmArgs += listOf("-Dskiko.renderApi=SOFTWARE")
-                bundleID = "de.uzl.itcr.terminodiff"
-                signing {
-                    sign.set(false)
+                when (composeBuildOs) {
+                    "ubuntu", "redhat" -> linux {
+                        iconFile.set(resourceDir.file("common/terminodiff.png"))
+                        rpmLicenseType = "GPL-3.0"
+                        debMaintainer = "[email protected]"
+                        appCategory = "Development"
+                        when (composeBuildOs) {
+                            "ubuntu" -> targetFormats(
+                                TargetFormat.Deb,
+                            )
+                            "redhat" -> targetFormats(
+                                TargetFormat.Rpm
+                            )
+                        }
+                    }
+                    "mac" -> macOS {
+                        jvmArgs += listOf("-Dskiko.renderApi=SOFTWARE")
+                        bundleID = "de.uzl.itcr.terminodiff"
+                        signing {
+                            sign.set(false)
+                        }
+                        iconFile.set(resourceDir.file("macos/terminodiff.icns"))
+                        targetFormats(
+                            TargetFormat.Dmg
+                        )
+                    }
+                    "windows" -> windows {
+                        iconFile.set(resourceDir.file("windows/terminodiff.ico"))
+                        perUserInstall = true
+                        dirChooser = true
+                        upgradeUuid = "ECFA19D9-D1F2-4AF5-9E5E-59A8F21C3A79"
+                        menuGroup = "TerminoDiff"
+                        targetFormats(
+                            TargetFormat.Exe
+                        )
+                    }
                 }
-                iconFile.set(resourceDir.file("macos/terminodiff.icns"))
-                targetFormats(
-                    TargetFormat.Dmg
-                )
-            }*/
-            windows {
-                iconFile.set(resourceDir.file("windows/terminodiff.ico"))
-                perUserInstall = true
-                dirChooser = true
-                upgradeUuid = "ECFA19D9-D1F2-4AF5-9E5E-59A8F21C3A79"
-                menuGroup = "TerminoDiff"
-                targetFormats(
-                    TargetFormat.Exe
-                )
             }
         }
     }

gradle.properties

@@ -1 +1,4 @@
-kotlin.code.style=official
+kotlin.code.style=official
+projectVersion=1.1.0
+composeBuildVersion=1.1.0
+composeBuildOs=windows

settings.gradle.kts

@@ -7,4 +7,3 @@ pluginManagement {
 
 }
 rootProject.name = "TerminoDiff"
-

src/main/kotlin/Main.kt

@@ -105,6 +105,7 @@ fun AppWindow(
             localizedStrings = localizedStrings,
             diffDataContainer = diffDataContainer,
             scrollState = scrollState,
+            fhirContext = fhirContext,
             useDarkTheme = useDarkTheme,
             onLocaleChange = {
                 locale = when (locale) {
@@ -116,7 +117,7 @@ fun AppWindow(
                 diffDataContainer.localizedStrings = getStrings(locale)
             },
             onChangeDarkTheme = onChangeDarkTheme,
-            splitPaneState = splitPaneState
+            splitPaneState = splitPaneState,
         )
     }
 }