diff --git a/json-schema-validator/build.gradle.kts b/json-schema-validator/build.gradle.kts index 4692468e..2bb68881 100644 --- a/json-schema-validator/build.gradle.kts +++ b/json-schema-validator/build.gradle.kts @@ -24,42 +24,21 @@ kotlin { } sourceSets { - val commonMain by getting { + commonMain { dependencies { api(libs.kotlin.serialization.json) api(libs.uri) // When using approach like above you won't be able to add because block - implementation( - libs.kotlin.codepoints - .get() - .toString(), - ) { + implementation(libs.kotlin.codepoints.get().toString()) { because("simplifies work with unicode codepoints") } - implementation(libs.karacteristics) - } - } - - val nonWasmJsMain by creating { - dependsOn(commonMain) - - dependencies { implementation(libs.normalize.get().toString()) { because("provides normalization required by IDN-hostname format") } + implementation(libs.karacteristics) } } - jvmMain { - dependsOn(nonWasmJsMain) - } - jsMain { - dependsOn(nonWasmJsMain) - } - nativeMain { - dependsOn(nonWasmJsMain) - } - commonTest { dependencies { implementation(libs.kotest.assertions.core) diff --git a/json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.kt b/json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.kt index cef03df2..44d3a03c 100644 --- a/json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.kt +++ b/json-schema-validator/src/commonMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.kt @@ -1,3 +1,8 @@ package io.github.optimumcode.json.schema.internal.hostname -internal expect fun isNormalized(label: String): Boolean \ No newline at end of file +import doist.x.normalize.Form +import doist.x.normalize.normalize + +internal fun isNormalized(label: String): Boolean { + return label.normalize(Form.NFC) == label +} \ No newline at end of file diff --git a/json-schema-validator/src/nonWasmJsMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.nonWasmJs.kt b/json-schema-validator/src/nonWasmJsMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.nonWasmJs.kt deleted file mode 100644 index a63678dc..00000000 --- a/json-schema-validator/src/nonWasmJsMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.nonWasmJs.kt +++ /dev/null @@ -1,8 +0,0 @@ -package io.github.optimumcode.json.schema.internal.hostname - -import doist.x.normalize.Form -import doist.x.normalize.normalize - -internal actual fun isNormalized(label: String): Boolean { - return label.normalize(Form.NFC) == label -} \ No newline at end of file diff --git a/json-schema-validator/src/wasmJsMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.wasmJs.kt b/json-schema-validator/src/wasmJsMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.wasmJs.kt deleted file mode 100644 index 4a28b4f0..00000000 --- a/json-schema-validator/src/wasmJsMain/kotlin/io/github/optimumcode/json/schema/internal/hostname/Normalizer.wasmJs.kt +++ /dev/null @@ -1,3 +0,0 @@ -package io.github.optimumcode.json.schema.internal.hostname - -internal actual fun isNormalized(label: String): Boolean = js("label.normalize('NFC') === label") \ No newline at end of file