From 507f67389e974a687d8ce6415ce70c48a724093a Mon Sep 17 00:00:00 2001 From: Aaron Todd Date: Mon, 7 Aug 2023 16:56:21 -0400 Subject: [PATCH] chore: update kotlin to 1.8.22; kotlinx.coroutines to 1.7.3 (#909) --- .../1cd85099-9aa4-492a-a4b8-72e01da5d633.json | 5 +++++ .../70eb72c8-2b3d-4853-8d6f-98ea28474eb6.json | 5 +++++ .../kotlin/codegen/core/KotlinDependency.kt | 2 +- gradle.properties | 9 ++++---- runtime/build.gradle.kts | 21 ------------------- .../runtime/crt/ReadChannelBodyStream.kt | 2 +- .../engine/crt/SdkStreamResponseHandler.kt | 2 +- runtime/runtime-core/build.gradle.kts | 2 +- .../impl/AdaptiveRetryIntegrationTest.kt | 5 ++--- 9 files changed, 20 insertions(+), 33 deletions(-) create mode 100644 .changes/1cd85099-9aa4-492a-a4b8-72e01da5d633.json create mode 100644 .changes/70eb72c8-2b3d-4853-8d6f-98ea28474eb6.json diff --git a/.changes/1cd85099-9aa4-492a-a4b8-72e01da5d633.json b/.changes/1cd85099-9aa4-492a-a4b8-72e01da5d633.json new file mode 100644 index 000000000..077643215 --- /dev/null +++ b/.changes/1cd85099-9aa4-492a-a4b8-72e01da5d633.json @@ -0,0 +1,5 @@ +{ + "id": "1cd85099-9aa4-492a-a4b8-72e01da5d633", + "type": "misc", + "description": "Upgrade Kotlin to 1.8.22" +} \ No newline at end of file diff --git a/.changes/70eb72c8-2b3d-4853-8d6f-98ea28474eb6.json b/.changes/70eb72c8-2b3d-4853-8d6f-98ea28474eb6.json new file mode 100644 index 000000000..d14472530 --- /dev/null +++ b/.changes/70eb72c8-2b3d-4853-8d6f-98ea28474eb6.json @@ -0,0 +1,5 @@ +{ + "id": "70eb72c8-2b3d-4853-8d6f-98ea28474eb6", + "type": "misc", + "description": "Upgrade kotlinx.coroutines to 1.7.3" +} \ No newline at end of file diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt index ef811aefb..67eed5781 100644 --- a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt +++ b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt @@ -34,7 +34,7 @@ private fun getDefaultRuntimeVersion(): String { // publishing info const val RUNTIME_GROUP: String = "aws.smithy.kotlin" val RUNTIME_VERSION: String = System.getProperty("smithy.kotlin.codegen.clientRuntimeVersion", getDefaultRuntimeVersion()) -val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "1.8.10") +val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "1.8.22") enum class SourceSet { CommonMain, diff --git a/gradle.properties b/gradle.properties index 70bb4929d..eaf058c16 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,16 @@ kotlin.incremental.js=true kotlin.incremental.multiplatform=true kotlin.mpp.stability.nowarn=true kotlin.native.ignoreDisabledTargets=true -kotlin.mpp.enableCompatibilityMetadataVariant=true # SDK -sdkVersion=0.24.1-SNAPSHOT +sdkVersion=0.25.0-SNAPSHOT # kotlin -kotlinVersion=1.8.10 +kotlinVersion=1.8.22 dokkaVersion=1.7.10 # kotlin libraries -coroutinesVersion=1.6.4 +coroutinesVersion=1.7.3 ktorVersion=2.2.2 atomicFuVersion=0.19.0 kotlinxSerializationVersion=1.4.1 @@ -42,4 +41,4 @@ kamlVersion=0.49.0 slf4jVersion=2.0.6 # crt -crtKotlinVersion=0.6.8 \ No newline at end of file +crtKotlinVersion=0.7.0-SNAPSHOT diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts index c4153692f..6e93c5048 100644 --- a/runtime/build.gradle.kts +++ b/runtime/build.gradle.kts @@ -88,24 +88,3 @@ subprojects { dokkaPlugin(project(":dokka-smithy")) } } - -task("rootAllTest") { - destinationDir = File(project.buildDir, "reports/tests/rootAllTest") - val rootAllTest = this - subprojects { - afterEvaluate { - if (tasks.findByName("allTests") != null) { - val provider = tasks.named("allTests") - val allTestsTaskProvider = provider as TaskProvider - rootAllTest.addChild(allTestsTaskProvider) - rootAllTest.dependsOn(allTestsTaskProvider) - } - } - } - - beforeEvaluate { - project.gradle.taskGraph.whenReady { - rootAllTest.maybeOverrideReporting(this) - } - } -} diff --git a/runtime/crt-util/common/src/aws/smithy/kotlin/runtime/crt/ReadChannelBodyStream.kt b/runtime/crt-util/common/src/aws/smithy/kotlin/runtime/crt/ReadChannelBodyStream.kt index efa0d0cea..fa6bdc2d2 100644 --- a/runtime/crt-util/common/src/aws/smithy/kotlin/runtime/crt/ReadChannelBodyStream.kt +++ b/runtime/crt-util/common/src/aws/smithy/kotlin/runtime/crt/ReadChannelBodyStream.kt @@ -69,7 +69,7 @@ public class ReadChannelBodyStream( override fun sendRequestBody(buffer: MutableBuffer): Boolean = doSendRequestBody(buffer).also { if (it) producerJob.complete() } - @OptIn(ExperimentalCoroutinesApi::class) + @OptIn(DelicateCoroutinesApi::class) private fun doSendRequestBody(buffer: MutableBuffer): Boolean { // ensure the request context hasn't been cancelled callContext.ensureActive() diff --git a/runtime/protocol/http-client-engines/http-client-engine-crt/common/src/aws/smithy/kotlin/runtime/http/engine/crt/SdkStreamResponseHandler.kt b/runtime/protocol/http-client-engines/http-client-engine-crt/common/src/aws/smithy/kotlin/runtime/http/engine/crt/SdkStreamResponseHandler.kt index f1793f1dc..32190791a 100644 --- a/runtime/protocol/http-client-engines/http-client-engine-crt/common/src/aws/smithy/kotlin/runtime/http/engine/crt/SdkStreamResponseHandler.kt +++ b/runtime/protocol/http-client-engines/http-client-engine-crt/common/src/aws/smithy/kotlin/runtime/http/engine/crt/SdkStreamResponseHandler.kt @@ -26,7 +26,7 @@ import kotlin.coroutines.CoroutineContext * Implements the CRT stream response interface which proxies the response from the CRT to the SDK * @param conn The HTTP connection used to make the request. Will be closed when the response handler completes */ -@OptIn(ExperimentalCoroutinesApi::class) +@OptIn(ExperimentalCoroutinesApi::class, DelicateCoroutinesApi::class) internal class SdkStreamResponseHandler( private val conn: HttpClientConnection, private val callContext: CoroutineContext, diff --git a/runtime/runtime-core/build.gradle.kts b/runtime/runtime-core/build.gradle.kts index ddeecb149..18ef9da7d 100644 --- a/runtime/runtime-core/build.gradle.kts +++ b/runtime/runtime-core/build.gradle.kts @@ -15,7 +15,7 @@ buildscript { } plugins { - kotlin("plugin.serialization") version "1.8.0" + kotlin("plugin.serialization") version "1.8.21" } description = "Core runtime for Smithy clients and services generated by smithy-kotlin" diff --git a/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/retries/impl/AdaptiveRetryIntegrationTest.kt b/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/retries/impl/AdaptiveRetryIntegrationTest.kt index 6529b4a20..777508846 100644 --- a/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/retries/impl/AdaptiveRetryIntegrationTest.kt +++ b/runtime/runtime-core/jvm/test/aws/smithy/kotlin/runtime/retries/impl/AdaptiveRetryIntegrationTest.kt @@ -15,7 +15,6 @@ import kotlin.test.Test import kotlin.test.assertEquals import kotlin.time.Duration.Companion.seconds import kotlin.time.ExperimentalTime -import kotlin.time.TimeSource private const val TOLERANCE = 0.0000005 @@ -23,7 +22,7 @@ private const val TOLERANCE = 0.0000005 class AdaptiveRetryIntegrationTest { @Test fun testCubicCases() = runTest { - val timeSource = testTimeSource as TimeSource.WithComparableMarks + val timeSource = testTimeSource val testCases = adaptiveRetryCubicTestCases.deserializeYaml(CubicTestCase.serializer()) testCases.forEach { (name, tc) -> @@ -68,7 +67,7 @@ class AdaptiveRetryIntegrationTest { @Test fun testE2eCases() = runTest { - val timeSource = testTimeSource as TimeSource.WithComparableMarks + val timeSource = testTimeSource val testCases = adaptiveRetryE2eTestCases.deserializeYaml(E2eTestCase.serializer()) val config = AdaptiveRateLimiter.Config.Default val rateMeasurer = AdaptiveRateMeasurer(config, timeSource)