From db801996cb95c7dc337318b684c665e708783123 Mon Sep 17 00:00:00 2001 From: Charles Korn Date: Wed, 20 Nov 2019 21:32:18 +1100 Subject: [PATCH] Update to SnakeYAML 2.0. --- build.gradle.kts | 2 +- src/main/kotlin/com/charleskorn/kaml/Yaml.kt | 2 +- .../com/charleskorn/kaml/YamlException.kt | 2 +- .../com/charleskorn/kaml/YamlNodeReader.kt | 14 +++++----- .../kotlin/com/charleskorn/kaml/YamlOutput.kt | 28 +++++++++---------- .../kotlin/com/charleskorn/kaml/YamlParser.kt | 12 ++++---- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b3b5e656..0d906820 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { implementation(platform("org.jetbrains.kotlin:kotlin-bom")) implementation(kotlin("stdlib-jdk8")) - implementation(group = "org.snakeyaml", name = "snakeyaml-engine", version = "1.0") + implementation(group = "org.snakeyaml", name = "snakeyaml-engine", version = "2.0") implementation(group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-runtime", version = "0.14.0") val spekVersion = "2.0.8" diff --git a/src/main/kotlin/com/charleskorn/kaml/Yaml.kt b/src/main/kotlin/com/charleskorn/kaml/Yaml.kt index d1c08441..c4174990 100644 --- a/src/main/kotlin/com/charleskorn/kaml/Yaml.kt +++ b/src/main/kotlin/com/charleskorn/kaml/Yaml.kt @@ -26,7 +26,7 @@ import kotlinx.serialization.decode import kotlinx.serialization.encode import kotlinx.serialization.modules.EmptyModule import kotlinx.serialization.modules.SerialModule -import org.snakeyaml.engine.v1.api.StreamDataWriter +import org.snakeyaml.engine.v2.api.StreamDataWriter import java.io.StringWriter class Yaml( diff --git a/src/main/kotlin/com/charleskorn/kaml/YamlException.kt b/src/main/kotlin/com/charleskorn/kaml/YamlException.kt index feffd630..f46db499 100644 --- a/src/main/kotlin/com/charleskorn/kaml/YamlException.kt +++ b/src/main/kotlin/com/charleskorn/kaml/YamlException.kt @@ -18,7 +18,7 @@ package com.charleskorn.kaml -import org.snakeyaml.engine.v1.events.Event +import org.snakeyaml.engine.v2.events.Event open class YamlException( override val message: String, diff --git a/src/main/kotlin/com/charleskorn/kaml/YamlNodeReader.kt b/src/main/kotlin/com/charleskorn/kaml/YamlNodeReader.kt index 7098c8cb..1540b481 100644 --- a/src/main/kotlin/com/charleskorn/kaml/YamlNodeReader.kt +++ b/src/main/kotlin/com/charleskorn/kaml/YamlNodeReader.kt @@ -18,13 +18,13 @@ package com.charleskorn.kaml -import org.snakeyaml.engine.v1.common.Anchor -import org.snakeyaml.engine.v1.events.AliasEvent -import org.snakeyaml.engine.v1.events.Event -import org.snakeyaml.engine.v1.events.MappingStartEvent -import org.snakeyaml.engine.v1.events.NodeEvent -import org.snakeyaml.engine.v1.events.ScalarEvent -import org.snakeyaml.engine.v1.events.SequenceStartEvent +import org.snakeyaml.engine.v2.common.Anchor +import org.snakeyaml.engine.v2.events.AliasEvent +import org.snakeyaml.engine.v2.events.Event +import org.snakeyaml.engine.v2.events.MappingStartEvent +import org.snakeyaml.engine.v2.events.NodeEvent +import org.snakeyaml.engine.v2.events.ScalarEvent +import org.snakeyaml.engine.v2.events.SequenceStartEvent import java.util.Optional class YamlNodeReader( diff --git a/src/main/kotlin/com/charleskorn/kaml/YamlOutput.kt b/src/main/kotlin/com/charleskorn/kaml/YamlOutput.kt index 9b29dc01..94892a5b 100644 --- a/src/main/kotlin/com/charleskorn/kaml/YamlOutput.kt +++ b/src/main/kotlin/com/charleskorn/kaml/YamlOutput.kt @@ -28,19 +28,19 @@ import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.StructureKind import kotlinx.serialization.internal.AbstractPolymorphicSerializer import kotlinx.serialization.modules.SerialModule -import org.snakeyaml.engine.v1.api.DumpSettingsBuilder -import org.snakeyaml.engine.v1.api.StreamDataWriter -import org.snakeyaml.engine.v1.common.FlowStyle -import org.snakeyaml.engine.v1.common.ScalarStyle -import org.snakeyaml.engine.v1.emitter.Emitter -import org.snakeyaml.engine.v1.events.DocumentStartEvent -import org.snakeyaml.engine.v1.events.ImplicitTuple -import org.snakeyaml.engine.v1.events.MappingEndEvent -import org.snakeyaml.engine.v1.events.MappingStartEvent -import org.snakeyaml.engine.v1.events.ScalarEvent -import org.snakeyaml.engine.v1.events.SequenceEndEvent -import org.snakeyaml.engine.v1.events.SequenceStartEvent -import org.snakeyaml.engine.v1.events.StreamStartEvent +import org.snakeyaml.engine.v2.api.DumpSettings +import org.snakeyaml.engine.v2.api.StreamDataWriter +import org.snakeyaml.engine.v2.common.FlowStyle +import org.snakeyaml.engine.v2.common.ScalarStyle +import org.snakeyaml.engine.v2.emitter.Emitter +import org.snakeyaml.engine.v2.events.DocumentStartEvent +import org.snakeyaml.engine.v2.events.ImplicitTuple +import org.snakeyaml.engine.v2.events.MappingEndEvent +import org.snakeyaml.engine.v2.events.MappingStartEvent +import org.snakeyaml.engine.v2.events.ScalarEvent +import org.snakeyaml.engine.v2.events.SequenceEndEvent +import org.snakeyaml.engine.v2.events.SequenceStartEvent +import org.snakeyaml.engine.v2.events.StreamStartEvent import java.util.Optional internal class YamlOutput( @@ -48,7 +48,7 @@ internal class YamlOutput( override val context: SerialModule, private val configuration: YamlConfiguration ) : ElementValueEncoder() { - private val settings = DumpSettingsBuilder().build() + private val settings = DumpSettings.builder().build() private val emitter = Emitter(settings, writer) private var currentTag: String? = null diff --git a/src/main/kotlin/com/charleskorn/kaml/YamlParser.kt b/src/main/kotlin/com/charleskorn/kaml/YamlParser.kt index 74c5f02b..995a52f2 100644 --- a/src/main/kotlin/com/charleskorn/kaml/YamlParser.kt +++ b/src/main/kotlin/com/charleskorn/kaml/YamlParser.kt @@ -18,16 +18,16 @@ package com.charleskorn.kaml -import org.snakeyaml.engine.v1.api.LoadSettingsBuilder -import org.snakeyaml.engine.v1.events.Event -import org.snakeyaml.engine.v1.exceptions.MarkedYamlEngineException -import org.snakeyaml.engine.v1.parser.ParserImpl -import org.snakeyaml.engine.v1.scanner.StreamReader +import org.snakeyaml.engine.v2.api.LoadSettings +import org.snakeyaml.engine.v2.events.Event +import org.snakeyaml.engine.v2.exceptions.MarkedYamlEngineException +import org.snakeyaml.engine.v2.parser.ParserImpl +import org.snakeyaml.engine.v2.scanner.StreamReader import java.io.StringReader class YamlParser(yamlSource: String) { private val dummyFileName = "DUMMY_FILE_NAME" - private val loadSettings = LoadSettingsBuilder().setLabel(dummyFileName).build() + private val loadSettings = LoadSettings.builder().setLabel(dummyFileName).build() private val streamReader = StreamReader(StringReader(yamlSource), loadSettings) private val events = ParserImpl(streamReader, loadSettings)