Skip to content

Commit e9c7f35

Browse files
committed
Move normalization logic back to common sources after wasm is supported by normaization library
1 parent f9d460c commit e9c7f35

File tree

4 files changed

+8
-31
lines changed

4 files changed

+8
-31
lines changed

json-schema-validator/build.gradle.kts

+2-19
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ kotlin {
2424
}
2525

2626
sourceSets {
27-
val commonMain by getting {
27+
commonMain {
2828
dependencies {
2929
api(libs.kotlin.serialization.json)
3030
api(libs.uri)
@@ -36,30 +36,13 @@ kotlin {
3636
) {
3737
because("simplifies work with unicode codepoints")
3838
}
39-
implementation(libs.karacteristics)
40-
}
41-
}
42-
43-
val nonWasmJsMain by creating {
44-
dependsOn(commonMain)
45-
46-
dependencies {
4739
implementation(libs.normalize.get().toString()) {
4840
because("provides normalization required by IDN-hostname format")
4941
}
42+
implementation(libs.karacteristics)
5043
}
5144
}
5245

53-
jvmMain {
54-
dependsOn(nonWasmJsMain)
55-
}
56-
jsMain {
57-
dependsOn(nonWasmJsMain)
58-
}
59-
nativeMain {
60-
dependsOn(nonWasmJsMain)
61-
}
62-
6346
commonTest {
6447
dependencies {
6548
implementation(libs.kotest.assertions.core)
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
package io.github.optimumcode.json.schema.internal.hostname
22

3-
internal expect fun isNormalized(label: String): Boolean
3+
import doist.x.normalize.Form
4+
import doist.x.normalize.normalize
5+
6+
internal fun isNormalized(label: String): Boolean {
7+
return label.normalize(Form.NFC) == label
8+
}

json-schema-validator/src/nonWasmJsMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.nonWasmJs.kt

-8
This file was deleted.

json-schema-validator/src/wasmJsMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.wasmJs.kt

-3
This file was deleted.

0 commit comments

Comments
 (0)