Skip to content

Commit 4eba414

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-disable-flaky-s3express-test
2 parents bd5f615 + 2634b84 commit 4eba414

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

codegen/aws-sdk-codegen/src/main/resources/META-INF/services/software.amazon.smithy.kotlin.codegen.integration.KotlinIntegration

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ aws.sdk.kotlin.codegen.customization.s3.express.SigV4S3ExpressAuthSchemeIntegrat
4242
aws.sdk.kotlin.codegen.customization.s3.express.S3ExpressIntegration
4343
aws.sdk.kotlin.codegen.customization.s3.S3ExpiresIntegration
4444
aws.sdk.kotlin.codegen.BusinessMetricsIntegration
45-
aws.sdk.kotlin.codegen.smoketests.AwsSmokeTestsRunnerGeneratorIntegration
46-
aws.sdk.kotlin.codegen.smoketests.testing.SmokeTestSuccessHttpEngineIntegration
47-
aws.sdk.kotlin.codegen.smoketests.testing.SmokeTestFailHttpEngineIntegration
45+
# aws.sdk.kotlin.codegen.smoketests.AwsSmokeTestsRunnerGeneratorIntegration
46+
# aws.sdk.kotlin.codegen.smoketests.testing.SmokeTestSuccessHttpEngineIntegration
47+
# aws.sdk.kotlin.codegen.smoketests.testing.SmokeTestFailHttpEngineIntegration
4848
aws.sdk.kotlin.codegen.customization.AwsQueryModeCustomization

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ coroutines-version = "1.9.0"
1111
atomicfu-version = "0.25.0"
1212

1313
# smithy-kotlin codegen and runtime are versioned separately
14-
smithy-kotlin-runtime-version = "1.3.20"
15-
smithy-kotlin-codegen-version = "0.33.20"
14+
smithy-kotlin-runtime-version = "1.3.21"
15+
smithy-kotlin-codegen-version = "0.33.21"
1616

1717
# codegen
1818
smithy-version = "1.51.0"

settings.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ include(":services")
5454
include(":tests")
5555
include(":tests:codegen:event-stream")
5656
include(":tests:e2e-test-util")
57-
include(":tests:codegen:smoke-tests")
58-
include(":tests:codegen:smoke-tests:services")
57+
// include(":tests:codegen:smoke-tests")
58+
// include(":tests:codegen:smoke-tests:services")
5959

6060
// generated services
6161
val File.isServiceDir: Boolean
@@ -71,11 +71,13 @@ file("services").listFiles().forEach {
7171
}
7272

7373
// generated services by smoke tests test suite
74+
/*
7475
file("tests/codegen/smoke-tests/services").listFiles().forEach {
7576
if (it.isServiceDir) {
7677
include(":tests:codegen:smoke-tests:services:${it.name}")
7778
}
7879
}
80+
*/
7981

8082
if ("dynamodb".isBootstrappedService) {
8183
include(":hll:dynamodb-mapper")

0 commit comments

Comments
 (0)