kn: merge from main (#1216)

Author: lauzadis

.brazil.json

@@ -1,13 +1,14 @@
 {
   "dependencies": {
-    "org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x",
+    "org.jetbrains.kotlin:kotlin-stdlib:2.*": "KotlinStdlib-2.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",
     "com.squareup.okio:okio-jvm:3.*": "OkioJvm-3.x",
     "io.opentelemetry:opentelemetry-api:1.*": "Maven-io-opentelemetry_opentelemetry-api-1.x",
     "org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
+    "aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
     "aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
     "com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x"
   },

.github/workflows/api-compat-verification.yml

@@ -3,7 +3,9 @@ name: API compatibility verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main, '*-main' ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   api-compat-verification:

.github/workflows/artifact-size-metrics.yml

@@ -2,7 +2,9 @@ name: Artifact Size Metrics
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main, '*-main' ]
+    branches:
+      - main
+      - '*-main'
   release:
     types: [published]
 
@@ -55,7 +57,7 @@ jobs:
       - name: Generate Artifact Size Metrics
         run: ./gradlew -Paws.kotlin.native=false artifactSizeMetrics
       - name: Analyze Artifact Size Metrics
-        run: ./gradlew -Paws.kotlin.native=false analyzeArtifactSizeMetrics
+        run: ./gradlew analyzeArtifactSizeMetrics
       - name: Show Results
         uses: actions/github-script@v7
         with:

.github/workflows/changelog-verification.yml

@@ -3,7 +3,9 @@ name: Changelog verification
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main, '*-main' ]
+    branches:
+      - main
+      - '*-main'
 
 jobs:
   changelog-verification:

.github/workflows/continuous-integration.yml

@@ -2,7 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   pull_request:
   workflow_dispatch:
 
@@ -66,7 +68,7 @@ jobs:
         run: |
           # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
           # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties              
-          ./gradlew apiCheck
+          ./gradlew -Paws.sdk.kotlin.crt.disableCrossCompile=true -Paws.kotlin.native.disableCrossCompile=true apiCheck
           ./gradlew -Paws.sdk.kotlin.crt.disableCrossCompile=true -Paws.kotlin.native.disableCrossCompile=true build
 
       - name: Save Test Reports
@@ -168,7 +170,7 @@ jobs:
 
       - name: Save Test Reports
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-reports-${{ matrix.os }}
           path: '**/build/reports'

.github/workflows/dependabot.yml

@@ -2,7 +2,9 @@ name: Dependabot Dependency Submission
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 permissions:
   contents: write

.github/workflows/kat-transform.yml

@@ -3,7 +3,9 @@ name: Kat Transform
 on:
   pull_request:
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
 
 # Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
 concurrency:
@@ -27,6 +29,9 @@ jobs:
         with:
           path: 'smithy-kotlin'
 
+      - name: Setup build
+        uses: ./smithy-kotlin/.github/actions/setup-build
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -36,13 +41,6 @@ jobs:
       - name: Setup kat
         uses: awslabs/aws-kotlin-repo-tools/.github/actions/setup-kat@main
 
-      - name: Configure JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: 17
-          cache: 'gradle'
-
       - name: Build
         working-directory: ./smithy-kotlin
         shell: bash
@@ -51,8 +49,8 @@ jobs:
           ls -lsa
           kat bump-version  # Bump from `vNext-SNAPSHOT` to `vNext`. kat transform only works on non-SNAPSHOT versions
           kat bump-version --property codegenVersion
-          ./gradlew build
-          ./gradlew publishAllPublicationsToTestLocalRepository
+          ./gradlew -Paws.kotlin.native=false build
+          ./gradlew -Paws.kotlin.native=false publishAllPublicationsToTestLocalRepository
 
       - name: Transform
         working-directory: ./smithy-kotlin

.github/workflows/lint.yml

@@ -5,8 +5,11 @@ on:
     branches:
       - '**'
       - '!main'
+      - '!*-main'
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - '*-main'
   workflow_dispatch:
 
 env:

.gitignore

@@ -8,6 +8,7 @@ out/
 # Compiled class file
 *.class
 *.klib
+.kotlin/
 
 # Log file
 *.log

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [1.4.1] - 01/16/2025
+
+## [1.4.0] - 01/15/2025
+
+### Features
+* [#1431](https://github.com/awslabs/aws-sdk-kotlin/issues/1431) ⚠️ **IMPORTANT**: Add `retryStrategy` configuration option for waiters
+
+### Fixes
+* [#1321](https://github.com/awslabs/aws-sdk-kotlin/issues/1321) Include more information when retry strategy halts early due to token bucket capacity errors
+
+### Miscellaneous
+* ⚠️ **IMPORTANT**: Upgrade to Kotlin 2.1.0
+
+## [1.3.34] - 01/10/2025
+
+## [1.3.33] - 01/10/2025
+
+## [1.3.32] - 01/06/2025
+
+### Fixes
+* Fix serialization of CBOR blobs
+
 ## [1.3.31] - 12/18/2024
 
 ### Features