Skip to content

Commit 32c2b7f

Browse files
committed
Merge branch 'main' of github.com:smithy-lang/smithy-kotlin into kn-main
2 parents 43e39b8 + d06ee0a commit 32c2b7f

File tree

13 files changed

+51
-13
lines changed

13 files changed

+51
-13
lines changed

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

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

810
jobs:
911
api-compat-verification:

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

Lines changed: 5 additions & 3 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, '*-main' ]
5+
branches:
6+
- main
7+
- '*-main'
68
release:
79
types: [published]
810

@@ -53,9 +55,9 @@ jobs:
5355
role-to-assume: ${{ secrets.CI_AWS_ROLE_ARN }}
5456
aws-region: us-west-2
5557
- name: Generate Artifact Size Metrics
56-
run: ./gradlew -Paws.kotlin.native=false artifactSizeMetrics
58+
run: ./gradlew artifactSizeMetrics
5759
- name: Analyze Artifact Size Metrics
58-
run: ./gradlew -Paws.kotlin.native=false analyzeArtifactSizeMetrics
60+
run: ./gradlew analyzeArtifactSizeMetrics
5961
- name: Show Results
6062
uses: actions/github-script@v7
6163
with:

.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, '*-main' ]
6+
branches:
7+
- main
8+
- '*-main'
79

810
jobs:
911
changelog-verification:

.github/workflows/continuous-integration.yml

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

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

.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: 3 additions & 1 deletion
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:

.github/workflows/lint.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ on:
55
branches:
66
- '**'
77
- '!main'
8+
- '!*-main'
89
pull_request:
9-
branches: [ main ]
10+
branches:
11+
- main
12+
- '*-main'
1013
workflow_dispatch:
1114

1215
env:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ out/
88
# Compiled class file
99
*.class
1010
*.klib
11+
.kotlin/
1112

1213
# Log file
1314
*.log

CHANGELOG.md

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

3+
## [1.3.32] - 01/06/2025
4+
5+
### Fixes
6+
* Fix serialization of CBOR blobs
7+
38
## [1.3.31] - 12/18/2024
49

510
### Features

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/aws/protocols/core/QueryHttpBindingProtocolGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ abstract class AbstractQueryFormUrlSerializerGenerator(
145145
return shape.documentSerializer(ctx.settings, symbol, members) { writer ->
146146
writer.openBlock("internal fun #identifier.name:L(serializer: #T, input: #T) {", RuntimeTypes.Serde.Serializer, symbol)
147147
.call {
148-
renderSerializerBody(ctx, shape, shape.members().toList(), writer)
148+
renderSerializerBody(ctx, shape, members.toList(), writer)
149149
}
150150
.closeBlock("}")
151151
}

0 commit comments

Comments
 (0)