Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

misc: upgrade to kotlinx.coroutines 1.9.0 #1153

Merged
merged 4 commits into from
Sep 18, 2024
Merged

misc: upgrade to kotlinx.coroutines 1.9.0 #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
979019c
Upgrade to kotlinx.coroutines 1.9.0
lauzadis Sep 17, 2024
252e09b
Changelog
lauzadis Sep 17, 2024
bb96d1f
Remove unnecessary OptIn annotations
lauzadis Sep 18, 2024
bcb5788
Upgrade aws-crt-kotlin
lauzadis Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .brazil.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x",
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": "KotlinxCoroutinesCoreJvm-1.8.x",
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",

"com.squareup.okhttp3:okhttp-coroutines:5.*": "OkHttp3Coroutines-5.x",
"com.squareup.okhttp3:okhttp:5.*": "OkHttp3-5.x",
Expand Down Expand Up @@ -34,7 +34,7 @@
"resolvesConflictDependencies": {
"com.squareup.okhttp3:okhttp-coroutines:5.*": [
"KotlinStdlib-2.x",
"KotlinxCoroutinesCoreJvm-1.8.x",
"KotlinxCoroutinesCoreJvm-1.x",
"KotlinStdlibJdk7-2.x",
"KotlinStdlibJdk8-2.x"
],
Expand Down
5 changes: 5 additions & 0 deletions .changes/347d905e-25a5-49be-9d32-4fbf9305e85d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "347d905e-25a5-49be-9d32-4fbf9305e85d",
"type": "misc",
"description": "Upgrade to kotlinx.coroutines 1.9.0"
}
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ dokka-version = "1.9.10"
aws-kotlin-repo-tools-version = "0.4.10"

# libs
coroutines-version = "1.8.1"
coroutines-version = "1.9.0"
atomicfu-version = "0.24.0"
okhttp-version = "5.0.0-alpha.14"
okhttp4-version = "4.12.0"
okio-version = "3.9.0"
otel-version = "1.32.0"
slf4j-version = "2.0.9"
slf4j-v1x-version = "1.7.36"
crt-kotlin-version = "0.8.8"
crt-kotlin-version = "0.8.9"
micrometer-version = "1.13.2"

# codegen
Expand Down
3 changes: 1 addition & 2 deletions ...-core/common/test/aws/smithy/kotlin/runtime/retries/delay/StandardRetryTokenBucketTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import kotlin.test.assertEquals
import kotlin.test.assertIs
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.seconds
import kotlin.time.ExperimentalTime
import kotlin.time.TestTimeSource
import kotlin.time.TimeSource

Expand Down Expand Up @@ -107,7 +106,7 @@ class StandardRetryTokenBucketTest {
}
}

@OptIn(ExperimentalCoroutinesApi::class, ExperimentalTime::class)
@OptIn(ExperimentalCoroutinesApi::class)
private fun TestScope.tokenBucket(
useCircuitBreakerMode: Boolean = false,
initialTryCost: Int = 0,
Expand Down
3 changes: 1 addition & 2 deletions runtime/runtime-core/common/test/aws/smithy/kotlin/runtime/retries/delay/TimingUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import kotlinx.coroutines.test.currentTime
import kotlinx.coroutines.test.testTimeSource
import kotlin.test.assertEquals
import kotlin.time.Duration
import kotlin.time.ExperimentalTime
import kotlin.time.measureTimedValue

@OptIn(ExperimentalCoroutinesApi::class, ExperimentalTime::class)
@OptIn(ExperimentalCoroutinesApi::class)
suspend fun <T> TestScope.assertTime(expectedDuration: Duration, block: suspend () -> T): T {
val (result, actualDuration) = testTimeSource.measureTimedValue { block() }

Expand Down
3 changes: 1 addition & 2 deletions ...time-core/jvm/test/aws/smithy/kotlin/runtime/retries/impl/AdaptiveRetryIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ import kotlinx.coroutines.test.testTimeSource
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.time.Duration.Companion.seconds
import kotlin.time.ExperimentalTime

private const val TOLERANCE = 0.0000005

@OptIn(ExperimentalTime::class, ExperimentalCoroutinesApi::class)
@OptIn(ExperimentalCoroutinesApi::class)
class AdaptiveRetryIntegrationTest {
@Test
fun testCubicCases() = runTest {
Expand Down
Loading