kn: merge from main

.brazil.json

@@ -1,6 +1,6 @@
 {
   "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",
     "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x",
     "software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x"

.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 ]
+    branches:
+      - main
+      - '*-main'
   release:
     types: [published]
 
@@ -41,7 +43,7 @@ jobs:
           role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
           aws-region: us-west-2
       - name: Generate Artifact Size Metrics
-        run: ./gradlew artifactSizeMetrics
+        run: ./gradlew -Paws.kotlin.native=false artifactSizeMetrics
       - name: Analyze Artifact Size Metrics
         run: ./gradlew analyzeArtifactSizeMetrics
       - name: Show Results

.github/workflows/changelog-verification.yml

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

.github/workflows/ci.yaml

@@ -33,7 +33,7 @@ jobs:
       - name: Test with ${{ matrix.java-version }}
         shell: bash
         run: |
-          ./gradlew apiCheck
+          ./gradlew jvmApiCheck
           ./gradlew -Ptest.java.version=${{ matrix.java-version }} -Paws.sdk.kotlin.crt.disableCrossCompile=true jvmTest --stacktrace 
       - name: Save Test Reports
         if: failure()

.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:
@@ -50,8 +52,8 @@ jobs:
           pwd
           ls -lsa
           kat bump-version  # Bump from `vNext-SNAPSHOT` to `vNext`. kat transform only works on non-SNAPSHOT versions 
-          ./gradlew build
-          ./gradlew publishAllPublicationsToTestLocalRepository
+          ./gradlew -Paws.kotlin.native=false build
+          ./gradlew -Paws.kotlin.native=false publishAllPublicationsToTestLocalRepository
 
       - name: Transform
         working-directory: ./aws-crt-kotlin
@@ -67,4 +69,4 @@ jobs:
             exit 1
           fi
 
-          echo "Transformation succeeded!"
+          echo "Transformation succeeded!"

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.9.0] - 01/15/2025
+
+### Miscellaneous
+* Upgrade to Kotlin 2.1.0
+
 ## [0.8.10] - 10/16/2024
 
 ### Miscellaneous
@@ -36,12 +41,12 @@
 ## [0.8.4] - 01/10/2024
 
 ### Features
-* [#893](https://github.com/awslabs/smithy-kotlin/issues/893) Surface HTTP connection manager metrics
+* [#893](https://github.com/smithy-lang/smithy-kotlin/issues/893) Surface HTTP connection manager metrics
 
 ## [0.8.3] - 01/05/2024
 
 ### Features
-* [#893](https://github.com/awslabs/smithy-kotlin/issues/893) Enable access to metrics for HTTP streams
+* [#893](https://github.com/smithy-lang/smithy-kotlin/issues/893) Enable access to metrics for HTTP streams
 
 ## [0.8.2] - 11/17/2023
 
@@ -83,7 +88,7 @@
 ## [0.6.7] - 12/15/2022
 
 ### Features
-* [#759](https://github.com/awslabs/smithy-kotlin/issues/759) Add `writeChunk` method to HttpStream
+* [#759](https://github.com/smithy-lang/smithy-kotlin/issues/759) Add `writeChunk` method to HttpStream
 
 ## [0.6.6] - 11/22/2022
 

gradle.properties

@@ -8,7 +8,7 @@ kotlin.daemon.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # aws-crt-kotlin
-sdkVersion=0.8.11-SNAPSHOT
+sdkVersion=0.9.1-SNAPSHOT
 
 # publishing
 publishGroupName=aws.sdk.kotlin.crt

gradle/libs.versions.toml

@@ -1,11 +1,12 @@
 [versions]
-kotlin-version = "2.0.21"
+kotlin-version = "2.1.0"
 
-aws-kotlin-repo-tools-version = "0.4.16-kn"
+aws-kotlin-repo-tools-version = "0.4.21-kn"
 
 # libs
-crt-java-version = "0.31.3"
+crt-java-version = "0.33.7"
 coroutines-version = "1.9.0"
+binary-compatibility-validator-version = "0.16.3"
 
 # testing
 junit-version = "5.10.1"
@@ -30,7 +31,7 @@ junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", vers
 mockserver-netty = { module = "org.mock-server:mockserver-netty", version.ref = "mock-server-version" }
 
 [plugins]
-aws-kotlin-repo-tools-artifactsizemetrics = { id = "aws.sdk.kotlin.gradle.artifactsizemetrics", version.ref = "aws-kotlin-repo-tools-version" }
-aws-kotlin-repo-tools-kmp = { id = "aws.sdk.kotlin.gradle.kmp", version.ref = "aws-kotlin-repo-tools-version" }
 kotlin-multiplatform = {id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
-kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
+kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator-version" }
+aws-kotlin-repo-tools-kmp = { id = "aws.sdk.kotlin.gradle.kmp", version.ref = "aws-kotlin-repo-tools-version" }
+aws-kotlin-repo-tools-artifactsizemetrics = { id = "aws.sdk.kotlin.gradle.artifactsizemetrics", version.ref = "aws-kotlin-repo-tools-version" }