Skip to content

Commit a6ded28

Browse files
authored
Update to Kotlin 1.8.21 (#237)
* Remove redux + minimal React context implementation * Remove redux dependencies * Update to kotlin 1.8.21 * Re-implement language selection * Re-implement basic validation * Fix preset selection and options modification * Fix breaking tests due to changes in gson * Fix list-based options not being sent for validations * Remove no-ops + rely on context for Header for screen + lang select * Update test cases * Use contexts in Header * Refactor - eliminate prop drilling by using context where available * Update CLAUDE.md * Renaming * Don't try to merge presets with user entered options + improve naming + add comments regarding validationContext building Rename * Ignore local claude settings * One more comment
1 parent adcb8ee commit a6ded28

File tree

70 files changed

+3694
-3227
lines changed

Some content is hidden

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

70 files changed

+3694
-3227
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,3 +418,5 @@ gradle-app.setting
418418
**/build/
419419

420420
# End of https://www.toptal.com/developers/gitignore/api/intellij,java,kotlin,eclipse,osx,windows,java-web,intellij+iml,intellij+all,gradle
421+
422+
.claude/

CLAUDE.md

Lines changed: 405 additions & 0 deletions
Large diffs are not rendered by default.

build.gradle.kts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
22

33
plugins {
44
// Make sure the version for multiplatform and plugin.serialization match kotlinVersion in gradle.properties
5-
kotlin("multiplatform") version "1.6.21"
6-
kotlin("plugin.serialization") version "1.6.21"
5+
kotlin("multiplatform") version "1.8.21"
6+
kotlin("plugin.serialization") version "1.8.21"
77

88
id("org.hidetake.ssh") version "2.10.1"
99
id("org.openjfx.javafxplugin") version "0.0.8"
@@ -44,21 +44,27 @@ kotlin {
4444
useJUnit()
4545
}
4646
}
47-
js () {
47+
js(IR) {
4848
useCommonJs()
4949
binaries.executable()
5050
browser {
5151
binaries.executable()
5252
webpackTask {
53-
cssSupport.enabled = true
53+
cssSupport {
54+
enabled.set(true)
55+
}
5456
}
5557
runTask {
56-
cssSupport.enabled = true
58+
cssSupport {
59+
enabled.set(true)
60+
}
5761
}
5862
testTask {
5963
useKarma {
6064
useChromeHeadless()
61-
webpackConfig.cssSupport.enabled = true
65+
webpackConfig.cssSupport {
66+
enabled.set(true)
67+
}
6268
}
6369
}
6470
}
@@ -167,9 +173,6 @@ kotlin {
167173
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
168174
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-router-dom")
169175

170-
implementation("org.jetbrains.kotlin-wrappers:kotlin-redux")
171-
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-redux")
172-
173176
implementation("org.jetbrains.kotlin-wrappers:kotlin-mui")
174177
implementation("org.jetbrains.kotlin-wrappers:kotlin-mui-icons")
175178
implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion")

gradle.properties

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
kotlin.code.style=official
22
kotlin.js.generate.executable.default=false
3+
kotlin.js.compiler=ir
4+
kotlin.daemon.jvmargs=-Xmx2048m
35

46
# versions
57
fhirCoreVersion= 6.7.6
@@ -18,24 +20,24 @@ tornadoFXVersion=1.7.20
1820
# https://github.com/kotlin-hands-on/jvm-js-fullstack
1921
# https://github.com/kotlin-hands-on/web-app-react-kotlin-js-gradle
2022
#
21-
kotlinVersion=1.6.21
23+
kotlinVersion=1.8.21
2224

2325
# Version compatibility with kotlinVersion is noted in https://github.com/Kotlin/kotlinx.html/releases
24-
kotlinxHtmlVersion=0.7.5
26+
kotlinxHtmlVersion=0.8.0
2527
# Version compatibility with kotlinVersion is noted in https://github.com/Kotlin/kotlinx.coroutines/releases
26-
kotlinxCoroutinesVersion=1.6.3
28+
kotlinxCoroutinesVersion=1.7.1
2729
# Version compatibility with kotlinVersion is noted in https://github.com/Kotlin/kotlinx.serialization/releases
28-
kotlinxSerializationVersion=1.3.2
30+
kotlinxSerializationVersion=1.5.1
2931

3032
# This is the version of kotlinWrappers used for the management of things like our react wrappers.
3133
# See https://github.com/JetBrains/kotlin-wrappers
32-
kotlinWrappersVersion=0.0.1-pre.332-kotlin-1.6.21
34+
kotlinWrappersVersion=1.0.0-pre.561
3335

3436
# These versions are interrelated, sometimes in mysterious ways. kotlin-hands-on projects are a good indicator of
3537
# 'safe' combinations.
36-
ktorVersion=2.0.2
37-
jacksonVersion=2.12.6
38-
koinVersion=3.2.1
38+
ktorVersion=2.3.0
39+
jacksonVersion=2.15.0
40+
koinVersion=3.4.0
3941
logbackVersion=1.5.3
4042
kmongoVersion=4.5.0
4143

http-client-tests/tests/explicit-queries.http

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Content-Type: application/json
114114
client.log("issues:" + issues.length)
115115
client.assert(issues.length === 62);
116116
client.assert(containsIssue(issues, 2, 37, "The Snomed CT code 373270004 (Substance with penicillin structure and antibacterial mechanism of action) is not a member of the IPS free set", "BUSINESSRULE", "INFORMATION"))
117-
client.assert(containsIssue(issues, 144, 28, "This element does not match any known slice defined in the profile http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-composition|0.5.0-cibuild (this may not be a problem, but you should check that it's not intended to match a slice)", "INFORMATIONAL", "INFORMATION"))
117+
client.assert(containsIssue(issues, 144, 28, "This element does not match any known slice defined in the profile http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-composition|0.6.0-cibuild (this may not be a problem, but you should check that it's not intended to match a slice)", "INFORMATIONAL", "INFORMATION"))
118118
});
119119
%}
120120

http-client-tests/tests/preset-queries.http

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Content-Type: application/json
112112
client.log("issues:" + issues.length)
113113
client.assert(issues.length === 71);
114114
client.assert(containsIssue(issues, 2, 37, "The Snomed CT code 373270004 (Substance with penicillin structure and antibacterial mechanism of action) is not a member of the IPS free set", "BUSINESSRULE", "INFORMATION"))
115-
client.assert(containsIssue(issues, 144, 28, "This element does not match any known slice defined in the profile http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-composition|0.5.0-cibuild (this may not be a problem, but you should check that it's not intended to match a slice)", "INFORMATIONAL", "INFORMATION"))
115+
client.assert(containsIssue(issues, 144, 28, "This element does not match any known slice defined in the profile http://hl7.org.au/fhir/ps/StructureDefinition/au-ps-composition|0.6.0-cibuild (this may not be a problem, but you should check that it's not intended to match a slice)", "INFORMATIONAL", "INFORMATION"))
116116
});
117117
%}
118118

0 commit comments

Comments
 (0)