diff --git a/build.gradle.kts b/build.gradle.kts index 65c848c8..f7c7354e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -131,8 +131,8 @@ kotlin { sourceSets { jvmMain { dependencies { - implementation("com.charleskorn.kaml:kaml:0.98.0") - implementation("it.krzeminski:snakeyaml-engine-kmp:3.2.1") + implementation("com.charleskorn.kaml:kaml:0.102.0") + implementation("it.krzeminski:snakeyaml-engine-kmp:4.0.1") } } @@ -145,7 +145,7 @@ kotlin { implementation("io.kotest:kotest-assertions-core") implementation("io.kotest:kotest-common") - implementation("it.krzeminski:snakeyaml-engine-kmp:3.2.1") + implementation("it.krzeminski:snakeyaml-engine-kmp:4.0.1") implementation("io.github.optimumcode:json-schema-validator:0.5.2") } } diff --git a/src/jvmMain/kotlin/it/krzeminski/githubactionstyping/parsing/TypesManifestParsing.kt b/src/jvmMain/kotlin/it/krzeminski/githubactionstyping/parsing/TypesManifestParsing.kt index c217d468..063a7eec 100644 --- a/src/jvmMain/kotlin/it/krzeminski/githubactionstyping/parsing/TypesManifestParsing.kt +++ b/src/jvmMain/kotlin/it/krzeminski/githubactionstyping/parsing/TypesManifestParsing.kt @@ -20,10 +20,8 @@ data class ApiItem( fun parseTypesManifest(manifestString: String): Result = runCatching { - val loadedTypesManifest = Load( - // work-around for https://github.com/krzema12/snakeyaml-engine-kmp/pull/390 - LoadSettings.builder().setSchema(CoreSchema()).build() - ).loadOne(manifestString) + val loadedTypesManifest = Load(LoadSettings(schema = CoreSchema())) + .loadOne(manifestString) when (loadedTypesManifest) { null -> TypesManifest() diff --git a/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt b/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt index 252d3e53..65d28bc2 100644 --- a/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt +++ b/src/jvmTest/kotlin/it/krzeminski/githubactionstyping/JsonSchemaValidatorSchemaValidationTest.kt @@ -49,13 +49,7 @@ private fun beValid(): Matcher { MatcherResult( runCatching { schema.validate(dataFile.inputStream().use { - Load( - // work-around for https://github.com/krzema12/snakeyaml-engine-kmp/pull/390 - // Per https://yaml.org/spec/1.2.2/#recommended-schemas, the Core Schema is - // the recommended default schema that YAML processor should use unless - // instructed otherwise. - LoadSettings.builder().setSchema(CoreSchema()).build() - ).loadOne(it) + Load(LoadSettings(schema = CoreSchema())).loadOne(it) }.toJsonElement()) { errorMessage = buildString { if (errorMessage != null) {