Update to Kotlin 1.3.20.

This requires us to be explicit when we're using contextual serialization.
charleskorn · Jan 23, 2019 · 6f0963a · 6f0963a
1 parent 1e78dc9
commit 6f0963a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -32,12 +32,12 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-serialization:1.3.11")
+        classpath("org.jetbrains.kotlin:kotlin-serialization:1.3.20")
     }
 }
 
 plugins {
-    kotlin("jvm") version "1.3.11"
+    kotlin("jvm") version "1.3.20"
 
     apply { id("com.github.ben-manes.versions") version "0.20.0" }
 }
@@ -53,14 +53,14 @@ repositories {
 }
 
 dependencies {
-    compile(kotlin("stdlib-jdk8", "1.3.11"))
+    compile(kotlin("stdlib-jdk8", "1.3.20"))
     compile(group = "org.snakeyaml", name = "snakeyaml-engine", version = "1.0")
     compile(group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-runtime", version = "0.9.1")
 
     val spekVersion = "2.0.0-rc.1"
 
     // Override the version of kotlin-reflect used by Spek.
-    testImplementation(kotlin("reflect", "1.3.11"))
+    testImplementation(kotlin("reflect", "1.3.20"))
     testImplementation(group = "org.spekframework.spek2", name = "spek-dsl-jvm", version = spekVersion)
     testImplementation(group = "ch.tutteli.atrium", name = "atrium-cc-en_GB-robstoll", version = "0.8.0-alpha")
 

diff --git a/src/test/kotlin/com/charleskorn/kaml/YamlTest.kt b/src/test/kotlin/com/charleskorn/kaml/YamlTest.kt
@@ -23,6 +23,7 @@ import ch.tutteli.atrium.api.cc.en_GB.notToBeNullBut
 import ch.tutteli.atrium.api.cc.en_GB.toBe
 import ch.tutteli.atrium.api.cc.en_GB.toThrow
 import ch.tutteli.atrium.verbs.assert
+import kotlinx.serialization.ContextualSerialization
 import kotlinx.serialization.Decoder
 import kotlinx.serialization.Encoder
 import kotlinx.serialization.KSerializer
@@ -1016,7 +1017,7 @@ object YamlTest : Spek({
                 data class Inner(val name: String)
 
                 @Serializable
-                data class Container(val inner: Inner)
+                data class Container(@ContextualSerialization val inner: Inner)
 
                 val contextSerializer = object : KSerializer<Inner> {
                     override val descriptor: SerialDescriptor