From fcfc4166d2a3c552d6d42dea0e86400aaffaea31 Mon Sep 17 00:00:00 2001 From: lukellmann Date: Sat, 2 Sep 2023 14:36:14 +0200 Subject: [PATCH] Update dependencies * Ktor 2.3.3 -> 2.3.4 * kotlinx-datetime 0.4.0 -> 0.4.1 * Stately 2.0.0-rc1 -> 2.0.2 * SLF4J 2.0.7 -> 2.0.9 * Dokka 1.8.20 -> 1.9.0 * actions/checkout v3 -> v4 --- .github/workflows/deployment-ci.yml | 4 ++-- .github/workflows/docs-ci.yml | 2 +- .github/workflows/gradle-wrapper-validation.yml | 2 +- .../serialization/InstantSerializersTests.kt | 15 ++++----------- gradle/libs.versions.toml | 10 +++++----- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.github/workflows/deployment-ci.yml b/.github/workflows/deployment-ci.yml index 20f02ea035d..34aff73db6d 100644 --- a/.github/workflows/deployment-ci.yml +++ b/.github/workflows/deployment-ci.yml @@ -22,7 +22,7 @@ jobs: env: KORD_TEST_TOKEN: ${{ secrets.KORD_TEST_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: @@ -45,7 +45,7 @@ jobs: SIGNING_KEY: ${{ secrets.signingKey }} SIGNING_PASSWORD: ${{ secrets.signingPassword }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml index 60a35af52db..3912cb0b9b1 100644 --- a/.github/workflows/docs-ci.yml +++ b/.github/workflows/docs-ci.yml @@ -18,7 +18,7 @@ jobs: group: pages cancel-in-progress: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v3 with: diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 04c75d9bf1f..e58b1ef402f 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -9,6 +9,6 @@ jobs: name: Validate Gradle Wrapper runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 diff --git a/common/src/commonTest/kotlin/serialization/InstantSerializersTests.kt b/common/src/commonTest/kotlin/serialization/InstantSerializersTests.kt index fd14270901e..d03fe60f98c 100644 --- a/common/src/commonTest/kotlin/serialization/InstantSerializersTests.kt +++ b/common/src/commonTest/kotlin/serialization/InstantSerializersTests.kt @@ -8,9 +8,7 @@ import kotlin.js.JsName import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith -import kotlin.time.Duration import kotlin.time.Duration.Companion.nanoseconds -import kotlin.time.Duration.Companion.seconds private val EPOCH = Instant.fromEpochSeconds(0) @@ -74,11 +72,6 @@ class InstantInEpochMillisecondsSerializerTest : InstantSerializerTest( instant = Instant.fromEpochMilliseconds(796514689159), serializer = InstantInEpochMillisecondsSerializer, ) { - // workaround for https://github.com/Kotlin/kotlinx-datetime/issues/263, use normal operators when fix is released - private infix fun Instant.plus(duration: Duration) = (this + 1.seconds) - (1.seconds - duration) - private infix fun Instant.minus(duration: Duration) = (this - 1.seconds) + (1.seconds - duration) - - private val past = Instant.fromEpochMilliseconds(Long.MIN_VALUE) private val future = Instant.fromEpochMilliseconds(Long.MAX_VALUE) @@ -94,7 +87,7 @@ class InstantInEpochMillisecondsSerializerTest : InstantSerializerTest( fun `future Instant under limit can be serialized`() { assertEquals( expected = (if (futureClamped) clampedMax else Long.MAX_VALUE - 1).toString(), - actual = serialize(future minus 1.nanoseconds), + actual = serialize(future - 1.nanoseconds), ) } @@ -103,7 +96,7 @@ class InstantInEpochMillisecondsSerializerTest : InstantSerializerTest( fun `past Instant under limit can be serialized`() { assertEquals( expected = (if (pastClamped) clampedMin else Long.MIN_VALUE).toString(), - actual = serialize(past plus 1.nanoseconds), + actual = serialize(past + 1.nanoseconds), ) } @@ -130,13 +123,13 @@ class InstantInEpochMillisecondsSerializerTest : InstantSerializerTest( @Test @JsName("test11") fun `future Instant over limit cannot be serialized`() { - if (!futureClamped) assertFailsWith { serialize(future plus 1.nanoseconds) } + if (!futureClamped) assertFailsWith { serialize(future + 1.nanoseconds) } } @Test @JsName("test12") fun `past Instant over limit cannot be serialized`() { - if (!pastClamped) assertFailsWith { serialize(past minus 1.nanoseconds) } + if (!pastClamped) assertFailsWith { serialize(past - 1.nanoseconds) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75df3c821b1..99afd7d89ea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,17 +2,17 @@ # api dependencies kotlin = "1.9.10" # https://github.com/JetBrains/kotlin -ktor = "2.3.3" # https://github.com/ktorio/ktor +ktor = "2.3.4" # https://github.com/ktorio/ktor kotlinx-coroutines = "1.7.3" # https://github.com/Kotlin/kotlinx.coroutines kotlinx-serialization = "1.6.0" # https://github.com/Kotlin/kotlinx.serialization -kotlinx-datetime = "0.4.0" # https://github.com/Kotlin/kotlinx-datetime +kotlinx-datetime = "0.4.1" # https://github.com/Kotlin/kotlinx-datetime kotlin-logging = "3.0.5" # https://github.com/oshai/kotlin-logging kord-cache = "0.4.0" # https://github.com/kordlib/cache # implementation dependencies kotlin-node = "18.16.12-pre.619" # https://github.com/JetBrains/kotlin-wrappers bignum = "0.3.8" # https://github.com/ionspin/kotlin-multiplatform-bignum -stately = "2.0.0-rc1" # https://github.com/touchlab/Stately +stately = "2.0.2" # https://github.com/touchlab/Stately fastZlib = "2.0.1" # https://github.com/timotejroiko/fast-zlib # code generation @@ -22,10 +22,10 @@ kotlinpoet = "1.14.2" # https://github.com/square/kotlinpoet # tests junit5 = "5.10.0" # https://github.com/junit-team/junit5 mockk = "1.13.7" # https://github.com/mockk/mockk -slf4j = "2.0.7" # https://www.slf4j.org +slf4j = "2.0.9" # https://www.slf4j.org # plugins -dokka = "1.8.20" # https://github.com/Kotlin/dokka +dokka = "1.9.0" # https://github.com/Kotlin/dokka kotlinx-atomicfu = "0.22.0" # https://github.com/Kotlin/kotlinx-atomicfu binary-compatibility-validator = "0.13.2" # https://github.com/Kotlin/binary-compatibility-validator buildconfig = "4.1.2" # https://github.com/gmazzo/gradle-buildconfig-plugin