Skip to content

Commit

Permalink
Bump version to 0.14.0 @ Kotlin 1.3.60
Browse files Browse the repository at this point in the history
  • Loading branch information
sandwwraith committed Nov 19, 2019
1 parent 0d2414a commit cea9b43
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
buildscript {
if (project.hasProperty("bootstrap")) {
ext.kotlin_version = property('kotlin.version.snapshot')
ext["org.jetbrains.kotlin.native.home"] = System.getenv("KONAN_LOCAL_DIST")
ext["kotlin.native.home"] = System.getenv("KONAN_LOCAL_DIST")
} else {
ext.kotlin_version = property('kotlin.version')
}
Expand All @@ -25,7 +25,7 @@ buildscript {
]

/*
* These property group is used to build kotlinx.serialization against Kotlin compiler snapshot.
* This property group is used to build kotlinx.serialization against Kotlin compiler snapshot.
* When build_snapshot_train is set to true, kotlin_version property is overridden with kotlin_snapshot_version.
* DO NOT change the name of these properties without adapting kotlinx.train build chain.
*/
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#

group=org.jetbrains.kotlinx
version=0.14.0-1.3.60-eap-76
version=0.14.0

kotlin.version=1.3.60-eap-100
kotlin.version=1.3.60

# This version take precedence if 'bootstrap' property passed to project
kotlin.version.snapshot=1.3-SNAPSHOT
Expand Down
4 changes: 2 additions & 2 deletions integration-test/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Copyright 2017-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
#

mainKotlinVersion=1.3.50
mainLibVersion=0.13.0
mainKotlinVersion=1.3.60
mainLibVersion=0.14.0

kotlin.code.style=official

Expand Down
2 changes: 1 addition & 1 deletion integration-test/src/commonMain/kotlin/sample/Helpers.kt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class KeyValueInput(val inp: Parser) : ElementValueDecoder() {
override fun decodeFloat(): Float = readToken().toFloat()
override fun decodeDouble(): Double = readToken().toDouble()

override fun decodeEnum(enumDescription: EnumDescriptor): Int {
override fun decodeEnum(enumDescription: SerialDescriptor): Int {
return readToken().toInt()
}

Expand Down

0 comments on commit cea9b43

Please sign in to comment.