Skip to content

Commit bd5e169

Browse files
committed
Update to Kotlin 1.5.20
- Updated versions.kotlin to 1.5.20 - Changelog for 1.5.20: https://kotlinlang.org/docs/whatsnew1520.html - Changelog for 1.5.0: https://kotlinlang.org/docs/whatsnew15.html - Changelog for 1.4.30: https://kotlinlang.org/docs/whatsnew1430.html - Updated kotlinx-datetime from 0.1.1 to 0.2.1 since Kotlin 1.5.0 depends on datetime > 0.2.0 - Due to the changes to the experimental Duration inline value class; see: Kotlin/kotlinx-datetime#108 - Adjusted tests with the changes due to hardcoded values of some changes around the Kotlin JS/IR and Legacy JS apis Signed-off-by: Antal János Monori <[email protected]>
1 parent ed6f833 commit bd5e169

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ val kmpJsEnabled = System.getProperty("kjs", "true").toBoolean()
55
val kmpNativeEnabled = System.getProperty("knative", "true").toBoolean()
66

77
object versions {
8-
val kotlin = "1.4.20"
8+
val kotlin = "1.5.20"
99
val jmhPlugin = "0.5.0"
1010
val animalSnifferPlugin = "1.5.0"
1111
val dokka = "1.4.20"
@@ -46,7 +46,7 @@ object deps {
4646
val js = "org.jetbrains.kotlin:kotlin-test-js"
4747
}
4848

49-
val time = "org.jetbrains.kotlinx:kotlinx-datetime:0.1.1"
49+
val time = "org.jetbrains.kotlinx:kotlinx-datetime:0.2.1"
5050
}
5151

5252
object jmh {

okio/src/commonTest/kotlin/okio/AbstractFileSystemTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ abstract class AbstractFileSystemTest(
5858
val cwdString = cwd.toString()
5959
assertTrue(cwdString) {
6060
cwdString.endsWith("okio${Path.DIRECTORY_SEPARATOR}okio") ||
61-
cwdString.endsWith("${Path.DIRECTORY_SEPARATOR}okio-parent-okio-jsLegacy-test") ||
62-
cwdString.endsWith("${Path.DIRECTORY_SEPARATOR}okio-parent-okio-jsIr-test") ||
61+
cwdString.endsWith("${Path.DIRECTORY_SEPARATOR}okio-parent-okio-js-legacy-test") ||
62+
cwdString.endsWith("${Path.DIRECTORY_SEPARATOR}okio-parent-okio-js-ir-test") ||
6363
cwdString.contains("/CoreSimulator/Devices/") || // iOS simulator.
6464
cwdString == "/" // Android emulator.
6565
}

0 commit comments

Comments
 (0)