Skip to content

Commit 22e9b92

Browse files
authored
kn: merge from main (#127)
1 parent adb9e36 commit 22e9b92

File tree

9 files changed

+34
-20
lines changed

9 files changed

+34
-20
lines changed

.brazil.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x",
3+
"org.jetbrains.kotlin:kotlin-stdlib:2.*": "KotlinStdlib-2.x",
44
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
55
"org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x",
66
"software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x"

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Artifact Size Metrics
22
on:
33
pull_request:
44
types: [ opened, synchronize, reopened, labeled, unlabeled ]
5-
branches: [ main ]
5+
branches:
6+
- main
7+
- '*-main'
68
release:
79
types: [published]
810

@@ -41,7 +43,7 @@ jobs:
4143
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
4244
aws-region: us-west-2
4345
- name: Generate Artifact Size Metrics
44-
run: ./gradlew artifactSizeMetrics
46+
run: ./gradlew -Paws.kotlin.native=false artifactSizeMetrics
4547
- name: Analyze Artifact Size Metrics
4648
run: ./gradlew analyzeArtifactSizeMetrics
4749
- name: Show Results

.github/workflows/changelog-verification.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ name: Changelog verification
33
on:
44
pull_request:
55
types: [ opened, synchronize, reopened, labeled, unlabeled ]
6-
branches: [ main ]
6+
branches:
7+
- main
8+
- '*-main'
79

810
jobs:
911
changelog-verification:

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Test with ${{ matrix.java-version }}
3434
shell: bash
3535
run: |
36-
./gradlew apiCheck
36+
./gradlew jvmApiCheck
3737
./gradlew -Ptest.java.version=${{ matrix.java-version }} -Paws.sdk.kotlin.crt.disableCrossCompile=true jvmTest --stacktrace
3838
- name: Save Test Reports
3939
if: failure()

.github/workflows/dependabot.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: Dependabot Dependency Submission
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches:
6+
- main
7+
- '*-main'
68

79
permissions:
810
contents: write

.github/workflows/kat-transform.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ name: Kat Transform
33
on:
44
pull_request:
55
types: [ opened, synchronize, reopened, labeled, unlabeled ]
6-
branches: [ main ]
6+
branches:
7+
- main
8+
- '*-main'
79

810
# Allow one instance of this workflow per pull request, and cancel older runs when new changes are pushed
911
concurrency:
@@ -50,8 +52,8 @@ jobs:
5052
pwd
5153
ls -lsa
5254
kat bump-version # Bump from `vNext-SNAPSHOT` to `vNext`. kat transform only works on non-SNAPSHOT versions
53-
./gradlew build
54-
./gradlew publishAllPublicationsToTestLocalRepository
55+
./gradlew -Paws.kotlin.native=false build
56+
./gradlew -Paws.kotlin.native=false publishAllPublicationsToTestLocalRepository
5557
5658
- name: Transform
5759
working-directory: ./aws-crt-kotlin
@@ -67,4 +69,4 @@ jobs:
6769
exit 1
6870
fi
6971
70-
echo "Transformation succeeded!"
72+
echo "Transformation succeeded!"

CHANGELOG.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## [0.9.0] - 01/15/2025
4+
5+
### Miscellaneous
6+
* Upgrade to Kotlin 2.1.0
7+
38
## [0.8.10] - 10/16/2024
49

510
### Miscellaneous
@@ -36,12 +41,12 @@
3641
## [0.8.4] - 01/10/2024
3742

3843
### Features
39-
* [#893](https://github.com/awslabs/smithy-kotlin/issues/893) Surface HTTP connection manager metrics
44+
* [#893](https://github.com/smithy-lang/smithy-kotlin/issues/893) Surface HTTP connection manager metrics
4045

4146
## [0.8.3] - 01/05/2024
4247

4348
### Features
44-
* [#893](https://github.com/awslabs/smithy-kotlin/issues/893) Enable access to metrics for HTTP streams
49+
* [#893](https://github.com/smithy-lang/smithy-kotlin/issues/893) Enable access to metrics for HTTP streams
4550

4651
## [0.8.2] - 11/17/2023
4752

@@ -83,7 +88,7 @@
8388
## [0.6.7] - 12/15/2022
8489

8590
### Features
86-
* [#759](https://github.com/awslabs/smithy-kotlin/issues/759) Add `writeChunk` method to HttpStream
91+
* [#759](https://github.com/smithy-lang/smithy-kotlin/issues/759) Add `writeChunk` method to HttpStream
8792

8893
## [0.6.6] - 11/22/2022
8994

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ kotlin.daemon.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
88
org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
99

1010
# aws-crt-kotlin
11-
sdkVersion=0.8.11-SNAPSHOT
11+
sdkVersion=0.9.1-SNAPSHOT
1212

1313
# publishing
1414
publishGroupName=aws.sdk.kotlin.crt

gradle/libs.versions.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[versions]
2-
kotlin-version = "2.0.21"
2+
kotlin-version = "2.1.0"
33

4-
aws-kotlin-repo-tools-version = "0.4.16-kn"
4+
aws-kotlin-repo-tools-version = "0.4.21-kn"
55

66
# libs
7-
crt-java-version = "0.31.3"
7+
crt-java-version = "0.33.7"
88
coroutines-version = "1.9.0"
9+
binary-compatibility-validator-version = "0.16.3"
910

1011
# testing
1112
junit-version = "5.10.1"
@@ -30,7 +31,7 @@ junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", vers
3031
mockserver-netty = { module = "org.mock-server:mockserver-netty", version.ref = "mock-server-version" }
3132

3233
[plugins]
33-
aws-kotlin-repo-tools-artifactsizemetrics = { id = "aws.sdk.kotlin.gradle.artifactsizemetrics", version.ref = "aws-kotlin-repo-tools-version" }
34-
aws-kotlin-repo-tools-kmp = { id = "aws.sdk.kotlin.gradle.kmp", version.ref = "aws-kotlin-repo-tools-version" }
3534
kotlin-multiplatform = {id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
36-
kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
35+
kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator-version" }
36+
aws-kotlin-repo-tools-kmp = { id = "aws.sdk.kotlin.gradle.kmp", version.ref = "aws-kotlin-repo-tools-version" }
37+
aws-kotlin-repo-tools-artifactsizemetrics = { id = "aws.sdk.kotlin.gradle.artifactsizemetrics", version.ref = "aws-kotlin-repo-tools-version" }

0 commit comments

Comments
 (0)